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

Merge "Improve transition between AOD and lockscreen when media is playing for split shade" into udc-dev am: e132b30b am: 1f8576f5

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



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