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

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

Change-Id: I9fa1eafe87323c418a77b285dcafe39d44c62ac8