Merge "[TP] Reuse clock views in clock carousel" into tm-qpr-dev am: b6239929b5

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

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