[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6a24c90a1b -s ours am: 56ce8bc34d -s ours

am skip reason: Merged-In I40672a0745ac65549c539da73ebb5b1710fd2821 with SHA-1 5cc923fa21 is already in history

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

Change-Id: I7b976a8919ee71ef2d8adb4b1f8025b36642c03a