Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Iba7609a5bb883e5919e4e539609b7d91353a145c
Merged-In: Ia674d6df39bfa575ec58687303436df55ba94a3e