Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89 am: bf0d76e7 am: 91c25d90 am: 16ab1516

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



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