tree 161a121cc2729fc71e04e8f1e87e9c3b292f7bbe
parent a6e19f54b5a0e41faacfac9f79a968df21af1ed9
parent be4252fd76af2eca46d67ddc19dc3d45e04701ac
author Xin Li <delphij@google.com> 1572471740 -0700
committer android-build-merger <android-build-merger@google.com> 1572471740 -0700

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

Change-Id: Ibc06bd22657b622c398c70562014beabe9e103b6