[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 1aed8b369d -s ours
am skip reason: change_id I96a71b7a888dac84188d7e546b0bfb9082711da8 with SHA1 091d81511b is in history

Change-Id: Ie643a7289bb224a7641341ab20acd23fbe5aa47e