[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am: 0af31d1290 -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: If3c41f4a1a322677d783800db7c4576307ca5242 Signed-off-by: Automerger Merge Worker <[email protected]>