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

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



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