[automerger skipped] Merge Coral/Flame into AOSP master am: 44156adadd -s ours am: 8156cccb74 -s ours
am: 4ba8a5dd3b -s ours
am skip reason: change_id Id8fb9d29a2878e8eb97fd935fc25739255197dfd with SHA1 0ca0618d76 is in history

Change-Id: I4d3bd5802b7fdcc01e364dc3b0cc400421f85a16