Merge "Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89 am: 126314b3" into tm-d1-dev-plus-aosp am: f02ad34b am: a61ba008

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891



Change-Id: I6caa8568bd78d73f644dca784076df1174dd2c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>