tree 3f3e6410fd650bdce59d0bc4eb8d3ea8ad98225d
parent 4c7f7a16f148e8f94fcca922c97f974d31005c19
parent b7137cc2f5b626d8d644ccd8866c4dab837bbd99
author Xin Li <delphij@google.com> 1572469263 -0700
committer android-build-merger <android-build-merger@google.com> 1572469263 -0700

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

Change-Id: Id9937523e436f8cb308b7c435349b79eab8ef035