[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 2dfee227ff -s ours
am skip reason: change_id I9fc77bfb2ee9c2a7567dc3645cf8cf436388e975 with SHA1 2a16dc6aa2 is in history

Change-Id: I919b462022d6ac309f802799d53630d0a2b159b9