[automerger skipped] DO NOT MERGE - Merge Android 13 am: 818f0600d5 -s ours

am skip reason: Merged-In I552bd8c40996f8aead756163f9e244fe6a7c3223 with SHA-1 f31c0342a7 is already in history

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

Change-Id: I4a50cab7954f64e8adf60440b254ca1408baaef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>