Merge "Always showing big clock on the lockscreen in split shade" into...

Merge "Always showing big clock on the lockscreen in split shade" into sc-v2-dev am: 231abe13 am: 18488f6d

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

Change-Id: I6273b31508d59a407d9926e794668cd9a5e56c09