Merge "Fix media having wrong expansion on QQS/landscape after fold/unfold"...

Merge "Fix media having wrong expansion on QQS/landscape after fold/unfold" into tm-qpr-dev am: 668e9152

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



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