Merge "Ensure expanded view is visible after rotation" into udc-dev am: 243325ec am: f91e0712

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



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