Merge "Fix clock size in carousel is wrong in foldable" into udc-dev am: a44ec979a5 am: 254feed31d am: a1870df42d am: 6238b07f4b

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

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