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

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



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