Merge "Ensure the expanded view is visible after rotation while IME is up"...

Merge "Ensure the expanded view is visible after rotation while IME is up" into udc-dev am: d17e74c7 am: 84fa1073 am: 7d1dabaf am: 8e3632f2

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



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