Color Picker Section Refactor (1/3) am: 68e0a82a98

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

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