Merge "Improve clock carousel perf" into udc-dev am: d1d1b5a8b7 am: 3d149b67c4 am: 179edba7b9

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

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