Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I0fe413d210290da6bf77b1e42d191a30f62e1a8e
Merged-In: Ic82ec1d454525e73d49e020ed109ee1f6341cc31