Merge "Improve clock carousel" into udc-dev am: 4c10ff8b04

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

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