tree 202f22b06b90bff2fc9dd36abff5017cb012cbbe
parent be39e52ffe855a07fc11f9e989f91e6715317db4
parent 05ed316a8d34fe7efe7073876a75ef35cbf175fa
author Xin Li <delphij@google.com> 1572471779 -0700
committer android-build-merger <android-build-merger@google.com> 1572471779 -0700

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

Change-Id: I807d6cff3e5758ae1e716361bf7b49f096b72d22