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

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



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