[automerger skipped] Merge "[DO NOT MERGE]Revert "Migrate KeyguardClockSwitch...

[automerger skipped] Merge "[DO NOT MERGE]Revert "Migrate KeyguardClockSwitch to new shared Clock library"" into tm-qpr-dev am: a3b829c1 am: 65bc4a4c -s ours

am skip reason: subject contains skip directive

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



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