tree d00862cb1a1556c28c10469e6156b9d26ca1b51b
parent eaca3fc33c5d7ae15aee00cc976acd5c123b2365
parent 4e8f1845d54bfa731d7a5985db5fe3d77a5798c3
author Xin Li <delphij@google.com> 1572470528 -0700
committer android-build-merger <android-build-merger@google.com> 1572470528 -0700

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

Change-Id: I9878f486baa3549a0096f27576e5f4342c4c8846