[automerger skipped] Merge Coral/Flame into AOSP master am: ac8873f6d0 -s ours am: e257d9f41f -s ours am: 0056ac4496 -s ours
am: 1aa5eda5aa -s ours
am skip reason: change_id I7b9859b578eb453fb0504b508a8e56d9ad3038d3 with SHA1 005dc0d5e8 is in history

Change-Id: I1b58f21dfe082bd4cf23ac14a606cb81196cb122