[automerger skipped] Merge Coral/Flame into AOSP master
am: df41c3059d -s ours
am skip reason: change_id I67924606d0869a662c93c0e8f27b869c959f621c with SHA1 8784af3005 is in history

Change-Id: I393933fa8f52f46a0894d59840efd700d6b2d766