Merge "Color Option Mapping Correction" into tm-qpr-dev am: d3c279d30f

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

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