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

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

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