Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Idb4e9d5baa8f3a8f25f277b0d692ddca81d3a677
Merged-In: I8fce5a4b988354cd3275a58a19a6244fa9bf639c