Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I75419f484cad0fa96c7074653dc59f01db55275a
Merged-In: I784a1b25456b417f3e1affc8081077d71e4ac4f9