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

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

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



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