tree c59ecf5f126f2ce49ca0266609a4f62f6ad59f5e
parent 819ff9ef6e6ce0983c86cd0d5dcccb146f281523
parent 4d33f1a127ff65df6e2bced7ed70e66153b01c73
author Xin Li <delphij@google.com> 1572153306 -0700
committer android-build-merger <android-build-merger@google.com> 1572153306 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 4d33f1a127 -s ours
am skip reason: change_id I28864c5b8fdd4cb10628672ff5285ddf8391b2d3 with SHA1 819ff9ef6e is in history

Change-Id: I58a89e98025e481530b7c13df25ce7fa7f15977e