Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ib681d5115b8b09f47014d24d238507a167b53acf
Merged-In: Ie5ef0e7550a78f7469e49e02aff5732375eabff9