Merge "Clock Carousel Card Color Fix" into udc-qpr-dev am: 6e0da182b6

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

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