Merge "Carousel clock color updates" into udc-dev am: 59f7f71e am: 113b5acf

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



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