[automerger skipped] Merge Coral/Flame into AOSP master
am: b775825c4e -s ours
am skip reason: change_id If197304fa91f97ad78cbb9e0ea912cbc7d81e96b with SHA1 3b7114c4f2 is in history

Change-Id: I85e730a1dcd8050d7604374f7d526c7258f5fe7a