tree d7a327351d285f7e75585a51539d1965d76f25eb
parent 8478bd3ebf0c89e6579f5ac9392aeffcb7d04e36
parent 7cb58527146fe5dc417db0d6428854cbf961fbd0
author Xin Li <delphij@google.com> 1572473574 -0700
committer android-build-merger <android-build-merger@google.com> 1572473574 -0700

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

Change-Id: I99dabe471772dd270983efaa6edd19a21081b09b