[automerger skipped] Merge Coral/Flame into AOSP master
am: 9ca2abdb38 -s ours
am skip reason: change_id Ie74cb0199ce4f938f7f3a081967d2102f820423c with SHA1 9d5dd7caab is in history

Change-Id: I1d19ca0aba081f6db1bda1c8b77336a43cab1f02