Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ifb49d4b66ff2b7842da9ecf5f1bdeb252cce8ce3
Merged-In: I80e239bb17ad31c71f8dc632a3233e34dd5b9825