[automerger skipped] Merge Coral/Flame into AOSP master am: 45bba81ccd -s ours am: 9629ee30c7 -s ours
am: 3f1a897215 -s ours
am skip reason: change_id If7001a39517d7c4b04092f1aba6718e8994099a3 with SHA1 064e86b8de is in history

Change-Id: I57e3e50eddf796d712c5e9e30a4b5e64d68b200d