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

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

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