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

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

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