[automerger skipped] Merge Android 12 am: c875da6234 -s ours

am skip reason: Merged-In I5cd8ed57adca2a94eafd78a73a82e3c495846a29 with SHA-1 6b3db4ce8b is already in history

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

Change-Id: Ic048c925bced8445eada1d60263e0e1427aecf65