tree 48dcb87909b11c4a0e0252b51c57b3d541c674b3
parent 35ef2a759ae40cfc7ef160b7cf01d9bd256dd8de
parent 5afedc6761eaf25fd95f91d219c9e385022a55d3
author Xin Li <delphij@google.com> 1572475055 -0700
committer android-build-merger <android-build-merger@google.com> 1572475055 -0700

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

Change-Id: I6aede28da98e91690da7f315c3b3d9002b09860b