[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 69879436a5 -s ours
am: ed6870bb0a -s ours
am skip reason: change_id Ia3ae894786c281feced2161142a69775838b9ad5 with SHA1 b3ee534556 is in history

Change-Id: Ic75803d24bb3a29ef96be960a7911b094a00cac8