tree 0223b7b244ed4da87fb122f5f41ea04605a9eba0
parent 881157c4db980fc7ec1df7a9d1b3e7add9ae83f1
parent a16b90efcf376df7dd41f1e112adebdb39dc3a4a
author Xin Li <delphij@google.com> 1572461306 -0700
committer Xin Li <delphij@google.com> 1572461306 -0700

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

Bug: 142003500
Change-Id: Ib66a34da84fae678c54897ba7e19f9e62f8872bc