Merge "Media doesn't clip based on shade footer" into tm-qpr-dev am: 39e905c3 am: e55bc444

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



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