Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Iab63e20fc53abf06706ce3aa360968849314e396
Merged-In: I8f63d0c3e60d1d2b6be802d817a3a029b1535f3a