tree ee504edf9d20df04a19972d922e5cdcfcb4df7c3
parent 3723ee48212b14df31aea0d758fb351c4f82879c
parent 7969a3cf34a69642101c0412ecc1221600233a34
author Xin Li <delphij@google.com> 1572474949 -0700
committer android-build-merger <android-build-merger@google.com> 1572474949 -0700

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

Change-Id: Icca848962da6b783fe83d0a9aab120e47527e45c