tree 60eb05f2e88de4fce5c0d1574244d042b1357998
parent 6a1367ef9e9105986be6dae9953990ce2f288114
parent 65450e5be45f28f93f7bc40f6245259c805a0958
author Xin Li <delphij@google.com> 1572473531 -0700
committer android-build-merger <android-build-merger@google.com> 1572473531 -0700

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

Change-Id: I26ef047ba9a503aa8c5ebe057e95954aaf33c396