[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s ours am: 6386748dd0 -s ours

am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history

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

Change-Id: Ibe86a1f8a7a68a291899cc8a7e0fd562e302bce5