tree 33d151b914cdb28e17e3febf0a284f22f04ed95e
parent a1efbe6749071efa5cbd306cff20f90bc91f5c3c
parent 0301f2eba391349f9c1dc00e18f769f7f47ce2a6
author Xin Li <delphij@google.com> 1572553339 -0700
committer android-build-merger <android-build-merger@google.com> 1572553339 -0700

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

Change-Id: I6a629a003b818a7bdcfd0db4374676a2c07aba5c