tree 2f2fb7413c31ceb258ac0d353002305d4531e4c4
parent 80aeabe0823b0f839cf6e945b8cb84308d6d2053
parent 30f6c76384e15bd944ed331bdf9461717c576b09
author Xin Li <delphij@google.com> 1572469066 -0700
committer android-build-merger <android-build-merger@google.com> 1572469066 -0700

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

Change-Id: Iaedce822ce9ce5cf9979aa296f68ef9ebb8bbcfa