Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ib3ddfe8011d7c845c3f13e62d9ef2548cbe74c99
Merged-In: If7001a39517d7c4b04092f1aba6718e8994099a3