[automerger skipped] Merge Coral/Flame into AOSP master am: 3d5a90b4b9 -s ours am: f7755944ac -s ours
am: 277c7524d0 -s ours
am skip reason: change_id I9d3be804e07fc7386252025f68301b4cd587ef5f with SHA1 86faea6aec is in history

Change-Id: Ib78ff05a622932e49614f6c4e9a67004d38c091f