Merge "Revert "Now Playing is too low on the lock screen"" into tm-qpr-dev am:...

Merge "Revert "Now Playing is too low on the lock screen"" into tm-qpr-dev am: 91d98245 am: f7cb2978

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



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