[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: d3fd31c6bb -s ours

am skip reason: Change-Id I691254d108008b99ee1a6a2bc00ee963270cff8a with SHA-1 6008ef32d0 is in history

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

Change-Id: I1634890aeb7d40162e987f23ea539f3274fba578