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

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

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