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 am: 2a72f11f

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



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