[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 3f6a55895b -s ours

am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history

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

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