Merge "Clean up and refactor load initial colors (1/3)" into udc-dev am: 5a76e0ea am: 189b5d77

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



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