[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5a77711ecc -s ours am: c8de731948 -s ours am: 1dbc6cc9f5 -s ours

am skip reason: Change-Id Ie5da35d107ea80e8cd9546295dfca2c82ef3c61c with SHA-1 f07abd8abb is in history

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

Change-Id: I9c0602aa7d15e4de78683b1244b7a30983a726db
tree: da0c2851599838344810814a7073194f5fe07f31
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE
  8. OWNERS