tree f2c8dedcc2d474646878fb7c4e41edb24a92d496
parent af1a3ab562d936cad83d0da241630d8b7c538ba9
parent 883e1d0668f26f8b8b16b4ebe24c36701ae763e0
author Xin Li <delphij@google.com> 1572473612 -0700
committer android-build-merger <android-build-merger@google.com> 1572473612 -0700

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

Change-Id: Ia9c2f0113253179c30e9b75a57fed937f38a18bd