Merge "Ensure the expanded view is visible after rotation while IME is up" into udc-dev am: d17e74c7 am: b39bf0d4 am: 79158dfe am: c2d108ca

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



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