Merge changes from topic "clock-carousel-view-model" into udc-dev am: 83dc77473e

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

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