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

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



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