[automerger skipped] Merge "Merge Android 12L" am: 31d83bc139 -s ours am: a4d61aa0b7 -s ours am: 3a1160e01f -s ours am: cde1e78322 -s ours

am skip reason: Merged-In I5a4b1775eb06ead74d360332ef750fc2215378c7 with SHA-1 6a24c90a1b is already in history

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

Change-Id: I0b821d585195a2ef4c6bafafd06f6a1534a3b93e