tree e9fb14bd73b8f85c9c77b77ad76e7870a356acf0
parent de6dd07eb357f27dd91d19e388db2f0ecef4a5bf
parent 917fd112a2b615e7ca9fce3f100b3e2ea929494d
author Xin Li <delphij@google.com> 1572469216 -0700
committer android-build-merger <android-build-merger@google.com> 1572469216 -0700

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

Change-Id: Ief1a2a709a2eb1eb2a682b2125ad25b371942715