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: I3390d623b6c7333c918d48e1a598ba3747574212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>