Merge "Fix color tiles not changing  with light & dark theme" into udc-dev am: b309a6d7cc am: b713ab5300 am: 84921fbe5c am: d8f90b7857

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

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