Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I370caec4d7fad0ad2d9a228ecd88e8e7635a3532
Merged-In: Ia3bb9bdf895124f099b269ba59f4b8afca76eddd