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

Change-Id: Id943621aca89d1a0907b21718877ce06812fb420