Merge "Fix color picker section showing no wallpaper color on build" into tm-qpr-dev am: 5577bacd

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



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