tree ca733a5de79bdd95f2da40186474eab3570fa1a6
parent 9e380b0fe1ce42a103c4ab559d132ef4c5a12c48
parent 6a90c9e616e3fca5433b668f37cd4a3f03877b1e
author Xin Li <delphij@google.com> 1572473578 -0700
committer android-build-merger <android-build-merger@google.com> 1572473578 -0700

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

Change-Id: I1a445097e44e11155ecec6d60eae3ee240d5e4de