Merge "Clock UX Polish & code cleanup" into udc-dev am: 6ab22cb4f5 am: 17be1c9780

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

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