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: 817d0ca0 am: 72009a2a

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



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