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: f38994db am: e79e146e

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



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