[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: b2198fa670 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1 af8a6c724f is in history

Change-Id: I4584fa1059ebb28808a5e0acf4bfcfe07cf306dd