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

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

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