Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ic613c3e036c61e1ee9dbf3e88f8da8bab2be2a2f
Merged-In: I67924606d0869a662c93c0e8f27b869c959f621c