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

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

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