tree f25411d94aef534d353a74b0ddc2e57a86cdd1c4
parent 450fdc69439e65aec1bab561943770e796df428c
parent 547b9dc3133129609429924713aab5634e358350
author Xin Li <delphij@google.com> 1572552821 -0700
committer android-build-merger <android-build-merger@google.com> 1572552821 -0700

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

Change-Id: I6a34c7e4acdbdcff47847f069ec3a989ed41b6ba