[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 9ac0f46277 -s ours am: 54c0df1375 -s ours am: 92987a284d -s ours

am skip reason: Change-Id I154200abc92c71c6244479a5ad9c5e9e78d72b4e with SHA-1 8fc7f8c52d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/12470017

Change-Id: I2e881ef61c7f8308e1656bb1030c078424396736
tree: 827c59191f3400d95376eff28d2c46cfb6b50438
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS