Merge "Use custom ColorOptionIconView for color options" into udc-dev am: 61884449ce am: 0a61275c88

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

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