[automerger skipped] Merge Coral/Flame into AOSP master
am: 1c8d8f411f -s ours
am skip reason: change_id I34e201eb59bf126d62713f52363c778c65d6e9b9 with SHA1 80d57b6dfb is in history

Change-Id: I095eaa157530c3d84b11dad3d5af3343c9adfe39