Merge "Improve clock carousel perf" into udc-dev am: d1d1b5a8b7

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

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