Merge "Make ClockRegistry and its provider singleton" into udc-dev am: df602e63 am: 0bcc2b8a

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



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