Merge "Revert "Clean up and refactor load initial colors (1/3)"" into udc-dev...

Merge "Revert "Clean up and refactor load initial colors (1/3)"" into udc-dev am: 64ba797c am: 7336a79c

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



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