[automerger skipped] Merge "Migrate KeyguardClockSwitch to new shared Clock library" into tm-qpr-dev am: 5f092e150a am: b87db00ed8 -s ours
am skip reason: Merged-In Ia053aaec6987e00de980388a6c024d8bcf5203a2 with SHA-1 c8b33ca43f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451766
Change-Id: I79631aba94711bb89166a977944019064daebebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: