Merge "Fixing media player clipped in shade in large screen portrait" into...

Merge "Fixing media player clipped in shade in large screen portrait" into tm-qpr-dev am: 3900c53c

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



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