tree 22c387f4679749d0e28bf34ce52e1a8be05cd8af
parent 1623115d4cc0113406e5323ed919a2f964308d48
parent 7bbd949e5732106d2a33aac6e85bca9c6de5dd6a
author Xin Li <delphij@google.com> 1572476212 -0700
committer android-build-merger <android-build-merger@google.com> 1572476212 -0700

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

Change-Id: I685a9099b49e7460568c4ceb275b805206d0248d