Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I9eb4a24c05895e2d7453ec5ca4fad8329c11ca9a
Merged-In: I26e13dd88b006577b73f2528aaa5940492f45f7c