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

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



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