Merge "Merge "Resolve NPE when mini resolver is rotated" into tm-dev am:...

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

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



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