[automerger skipped] Merge "Merge Android R" am: 8808cb9b0a -s ours

am skip reason: Change-Id I0458473bf83a3196a87e6764c345c667f3d5f663 with SHA-1 5a77711ecc is in history

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

Change-Id: Ic8215e4c309b3184fe2c48a209d85543a817d2fa