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

am skip reason: Change-Id I87b80291cb87768fba97613521d68be69d008cab with SHA-1 a51ffb7772 is in history

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

Change-Id: I5ffe30f4550ec91bbea8c297f32c151916ba9f43
tree: caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS