Merge "Merge "Improve transition between AOD and lockscreen when media is...

Merge "Merge "Improve transition between AOD and lockscreen when media is playing for split shade" into udc-dev am: e132b30b am: 714853b9 am: 777bb025" into udc-qpr-dev-plus-aosp am: c105e298

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



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