Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ice56c57b9a2047448a8cfa6ff19a6bbf475e8b36
Merged-In: Ibf1e116c34ddf69831cf83b9bdeafcc465a496cd