Merge "[Split shade] Fix large clock moving horizontally during screen off"...

Merge "[Split shade] Fix large clock moving horizontally during screen off" into tm-qpr-dev am: 09f7ed7e am: d7ed0a6b

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



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