[automerger skipped] Merge Coral/Flame into AOSP master
am: c73a97c6ee -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Ib87c586d8c444dbc786556c2e1e32c1eaa6f0c3f