[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: fbecf384e0 -s ours am: 4e5adba12b -s ours

am skip reason: Merged-In If3d36c15e515f85cd778a82be849fe01294b0ef1 with SHA-1 68c4302a23 is already in history

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

Change-Id: Iffb81ce795dccf678230d9476f5a2488676a5d3c