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: f91e0712 am: ffbd3e0f

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



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