[automerger skipped] Merge Coral/Flame into AOSP master am: 18a6c77c5b -s ours
am: b38f448b25 -s ours
am skip reason: change_id Ibf1e116c34ddf69831cf83b9bdeafcc465a496cd with SHA1 055b8cd133 is in history

Change-Id: Ie6b2086ca9b81e51421755a9c12062d55d63003a