tree 270adef92e44570263e1cba449be6fea18cbfbb5
parent 0185aa3fc96877e798c717de46c756ae6181cb25
parent 2f183eb4362457cf427ce41ed8f1ecb0ba2cf430
author Xin Li <delphij@google.com> 1572151696 -0700
committer android-build-merger <android-build-merger@google.com> 1572151696 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 2f183eb436 -s ours
am skip reason: change_id Ia674d6df39bfa575ec58687303436df55ba94a3e with SHA1 0185aa3fc9 is in history

Change-Id: I8856e4820528fd63e58038adb5c6407203f7df2f