Merge "[TP] Fix digital clocks in clock carousel" into tm-qpr-dev am: d109d5e4ba

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

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