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

[automerger skipped] [DO NOT MERGE]Revert "Migrate KeyguardClockSwitch to new shared Clock library" am: 23535e29 am: d47a8e2b -s ours

am skip reason: subject contains skip directive

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



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