tree 676b9d222520eb3561227e1dc134b6063b7dce15
parent 0b6869925abdf4bc58d89e631db2d69da2d71712
parent 2d513ce6b49fbc0577ab8ccff07ef5ac8df99a71
author Xin Li <delphij@google.com> 1572473734 -0700
committer android-build-merger <android-build-merger@google.com> 1572473734 -0700

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

Change-Id: I6be44581604b9e1d540a4b1c868f7b87fc1e2462