Merge "Fix media side clipping on large screen portrait" into tm-dev am: cf55babf am: aff93ca1

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



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