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