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

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

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