Merge "Fix for unresponsive color picker collection" into udc-dev am: 7e1f51159e

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

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