[automerger skipped] Merge "Merge Android 12" am: 3d9784b783 -s ours am: 9fcc300361 -s ours

am skip reason: Merged-In Id40f759a31c5db4ae954319ba7ab709c900017e4 with SHA-1 f7ac6c76a9 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/wallpapers/LivePicker/+/1847391

Change-Id: Ic99ad0e4a5a4b9e109de63665635ac62892463f7