[automerger skipped] Merge Coral/Flame into AOSP master
am: bc6ec2f120 -s ours
am skip reason: change_id I80e239bb17ad31c71f8dc632a3233e34dd5b9825 with SHA1 03c8fb1420 is in history

Change-Id: I71a4b932f269d09268829161dd0c180c79923936