tree 770cd9e448f27a2c1e91026b0580a59d35567649
parent ff124ea76024f9436c74ee17d84087b976915c49
parent 579dc6de52f17accec3c8d86c2eff1a380249b16
author Xin Li <delphij@google.com> 1572476344 -0700
committer android-build-merger <android-build-merger@google.com> 1572476344 -0700

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

Change-Id: Id28109048eae4c0746cc5d9aed0634ae5ba2d36f