[automerger skipped] Merge "Fixing media player clipped in shade in large screen portrait" into tm-qpr-dev am: 3900c53c am: e9dd74b8 -s ours

am skip reason: Merged-In If83c358bf5e4813398c3f2f24a52ec01c0e85499 with SHA-1 02f6edd1 is already in history

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



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