tree 089d19642c7ac39b432be5218d13022b49d30014
parent 3971aba041ed6e45f394d770eae1ff86f5a3c2c2
parent 2d1365626bab3877b254f9b9da2662151c80c685
author Xin Li <delphij@google.com> 1572461411 -0700
committer Xin Li <delphij@google.com> 1572461411 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I70194b2d4b8691268300781fe9ee1df676ea91d1