tree 38b756fe6a685d703007b3af82e5bd5a7a438826
parent 734b56dc80a5979e921620205b0758844a131d60
parent 32043511dab134e4c20543cb971352a484abef78
author Xin Li <delphij@google.com> 1572461267 -0700
committer Xin Li <delphij@google.com> 1572461267 -0700

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

Bug: 142003500
Change-Id: Ie10c67e120aff6f543a5ad9d5692e5a69a329b4b