Merge "Fix wallpaper picker color for contrast issues (2/2)" into udc-dev am: f398edf0

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



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