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

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



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