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

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



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