tree b0389e33dcdd2297db76e6a1742dfc244d22ee1a
parent 544375d6b49760403ad7cff0e39f44bb9813b215
parent f74ab95a1829050f547010a400a3cf2b1c49e7b3
author Xin Li <delphij@google.com> 1572154213 -0700
committer android-build-merger <android-build-merger@google.com> 1572154213 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: b03eb11e8c -s ours am: be38a8fdea -s ours
am: f74ab95a18 -s ours
am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history

Change-Id: Iaec8a84911ab6fceef638eac1a0ecdcd927c8042