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 am: a4a18303

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



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