tree fd3962c55527d38b8fe683e83a295eee1e05412b
parent 99d3d392fce2bac9caf2077b52e62e24948da487
parent afbeaac562915ce2a4acacdf28e83b28f33f7469
author Xin Li <delphij@google.com> 1572475037 -0700
committer android-build-merger <android-build-merger@google.com> 1572475037 -0700

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

Change-Id: I73e3e807b2602a2c04321f5cdf5e29a9609dbe24