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

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

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