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

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

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