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: aff93ca1 am: 4382ccc9 am: 7a4bb8ea

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



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