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

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

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