tree 2665c8d8acf7455978b53d990f455a615d6d4631
parent c62c2931227ceca85e67037c527aede911f0e5a6
parent 3d0754e664f848aeed94685962c9f0d8c708a929
author Xin Li <delphij@google.com> 1572553217 -0700
committer android-build-merger <android-build-merger@google.com> 1572553217 -0700

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

Change-Id: I4f2b0133621556b7f372871d86ad0732f6512d1f