[automerger skipped] Merge "Centering clock on AOD in split shade mode" into...

[automerger skipped] Merge "Centering clock on AOD in split shade mode" into sc-v2-dev am: 05f5356e am: e46c5303 -s ours

am skip reason: Merged-In If0742883b429b4537eb4033fce06c64a32de20a8 with SHA-1 6902bb32 is already in history

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

Change-Id: I38ccd257dd67c0d7bc313042e5d4255be7647c44