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

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



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