[automerger skipped] Merge "Merge Android R" am: 98339142d2 -s ours am: 1146c05658 -s ours am: 7b46ec81d3 -s ours am: da777193bd -s ours

am skip reason: Change-Id Iab6aa5e2dafdf1ff9629b35e4e2d77d4480b2c5b with SHA-1 5408141992 is in history

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

Change-Id: I94a5d017fbb6c1ec761f49a588151ba15f45cbee