[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 3066e20636 -s ours
am skip reason: change_id Ie78dbefaf12fb00fa8c4d1f352de87b43c7263bb with SHA1 37062b54f3 is in history

Change-Id: I5392a200d1337133d2bc4ae2347bcfadcf526df5