Merge "Fix color picker scroll position resets on select (1/2)" into...

Merge "Fix color picker scroll position resets on select (1/2)" into udc-qpr-dev am: 8615cbaa am: 42483c86

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



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