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

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

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