Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I4710e1b4db3ded770addc60503e9b814c7c3607f
Merged-In: Ia3ae894786c281feced2161142a69775838b9ad5