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: 714853b9 am: 5db80d96

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



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