[automerger skipped] Merge Coral/Flame into AOSP master
am: 03caa15dc3 -s ours
am skip reason: change_id I866e3d2ef61630300b6ccfa429d720026138b910 with SHA1 732595c5d5 is in history

Change-Id: I490bc89f54d82995afc9b8f5989215f73b62e6d7
tree: 6b3fe9c4233d07aebb04f622d9b5b6341386bb1f
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proto/
  5. res/
  6. src/