tree 5f86ac097e2846edf0e2430b44270148e8716a39
parent f3d43a630f6e27eeeda31a79be191a1b6473dcd7
parent de065d06b13aed7bd4f81fe5af83664797f6c88c
author Xin Li <delphij@google.com> 1572473487 -0700
committer android-build-merger <android-build-merger@google.com> 1572473487 -0700

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

Change-Id: I80ed56c3fced617e5135b48d9f4f33ac268af06a