Merge "Restore selected color position" into udc-dev am: be6f23f033 am: ffa59459e9

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

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