Merge "Showing small lockscreen clock when media player visible in split...

Merge "Showing small lockscreen clock when media player visible in split shade" into sc-v2-dev am: 1f172ff7 am: 19a55481

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

Change-Id: I44e2b8c811951e43b870c18c5edcb98b5d838e42