Merge "Ensure expanded view is visible after rotation" into udc-dev am:...

Merge "Ensure expanded view is visible after rotation" into udc-dev am: 243325ec am: 388abdb4 am: 4dccddc6

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



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