[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5408141992 -s ours am: 3e0559c411 -s ours

am skip reason: Change-Id Ia849c0db28e6aafb8f7cd8d69987fc9854cff2fe with SHA-1 84c924f162 is in history

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

Change-Id: I0e915f17b77aad7737f01cf74c5d29917cb12650