tree d9b5d450a0c207f74eb6df73bef3fb118e0ffe3d
parent f677d413dbb72b3b73305c8173692e5d7831fd5b
parent 89afc09debb37f9d9000e7939b5012560d8dc0ab
author Xin Li <delphij@google.com> 1572473582 -0700
committer android-build-merger <android-build-merger@google.com> 1572473582 -0700

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

Change-Id: I34e85cadce561885d3240e95997c5ce815ffa0fd