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: 132e1b2e

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



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