Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I3a8291f50c56aa2994af6cd454668dfcf5d3f0b1
Merged-In: Ice305db6bf112cd9feeeec0eef3d783e964fd741