Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I641d85c6a37479f4ec681766c8081642cd5cedd1
Merged-In: Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b