Merge "Now Playing is too low on the lock screen" into tm-qpr-dev am: 82d4e1f9 am: 4c45b0e0

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



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