Merge "Avoid clock carousel index-out-of-bound exception" into udc-qpr-dev am: 21c1fa7c

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



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