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

Merge "Fix media side clipping on large screen portrait" into tm-dev am: cf55babf am: 1843c265 am: 75572e6a

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



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