Fix color options showing default colors (2/3) am: c69969fc am: 0bde08a6

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



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