tree fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent 99e78ac95fc13cdf0f1e4036be0faca423f4c439
parent 7ea2e46dc1bce32d4d207408f2b4a14d5933bef5
author Xin Li <delphij@google.com> 1572470453 -0700
committer android-build-merger <android-build-merger@google.com> 1572470453 -0700

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

Change-Id: I580bebbf6a96c5ef6dfbb8e691917c16207551bb