Merge "Fix clock size in carousel is wrong in foldable" into udc-dev am: a44ec979a5 am: e4d5570dad am: 24e55fd992 am: d561eb1534

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

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