tree 11757ef184106ed6620caa712f103d75f8c32f42
parent 854124105a1a07faa9acefcfec5b9353b28bdfd9
parent 38e40aa9e0ed7c20999d410bbcab9f01ffdfa4f3
author Xin Li <delphij@google.com> 1572471814 -0700
committer android-build-merger <android-build-merger@google.com> 1572471814 -0700

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

Change-Id: Ie1e69e6dd4f2ffd8b499ad5a858a4157ad20ddf4