Merge "Fix color picker section showing no wallpaper color on build" into...

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

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



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