tree 26a0cc77bb00efc51979bb5303d0b906c628a2ee
parent fc109083f34d622106d7c2c468c9cf6dd905c137
parent 0ab9ec10ca302741e7921e04dfec9b95d1028d5e
author Xin Li <delphij@google.com> 1572470438 -0700
committer android-build-merger <android-build-merger@google.com> 1572470438 -0700

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

Change-Id: Ie4e6e94ea6feabfeac0d644f790f56416313dd54