tree 35c0ef7b3c9abfc1fc3ef715946bf525f493c7f3
parent f549753039e29f8452dab9cc5afc5a70562d64f7
parent 0e521ae9aa2c8b1b3d30870ec9662affef4b61a7
author Xin Li <delphij@google.com> 1572474997 -0700
committer android-build-merger <android-build-merger@google.com> 1572474997 -0700

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

Change-Id: I5f0719d4b33af0767ac47afc39acc088b236e4a4