Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I46b69f9e26628bd6126026c5732d80d36ce94ed1
Merged-In: Ia60091c66d30357a172089407558b329e4a73ca0