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

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

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