Merge "Clean up unused clock code" into udc-dev am: a4e5a624

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/22548681



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