Merge "Fix wallpaper picker container colors (2/2)" into udc-qpr-dev am: 63c3cda0 am: 7a22c5b3

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



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