tree b7b9cacbc37ee4dead0497d902f0cc4c232442c8
parent 0e4b28100d3968e5a36ede8ea2f7feb9bda47dc0
parent 298ebabc533a318150dc6ec67a08c7dfeb197f60
author Xin Li <delphij@google.com> 1572471864 -0700
committer android-build-merger <android-build-merger@google.com> 1572471864 -0700

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

Change-Id: Ia584ed311cffa0714558bf2181ed81f60189803f