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

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

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