[automerger skipped] Merge Coral/Flame into AOSP master
am: 79c63f1972 -s ours
am skip reason: change_id I0bc41a0c32d23e4741513ea3d7551e671724870f with SHA1 57d9c28a4c is in history

Change-Id: I33d1cc1eff4d2036a9eb8167385d64f33bce17d1
tree: be1467570e2c97aefbe9183cd668a7ce04c0cd10
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.bp
  7. AndroidManifest.xml
  8. OWNERS