Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Iac801e400bf71b25fd35c686c70f0d8977314e6c
Merged-In: Idcc41fbea7b61009be4b478fdd4ebebdf5b22586