Merge "Fix color option changes while applying dark/light theme" into tm-dev am: dd2fa83c

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



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