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: I2c2b60984f731b086399a626ccfe9bf0d3750ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>