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

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



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