tree cd82ecbd198a658463468eb9b988a40f4687a273
parent 7e165d7e0fbafb8f567a4dc766fea34aa387202a
parent e7fb5445b8d0cf4536ffb302b999746ab5bcc00b
author Xin Li <delphij@google.com> 1572475121 -0700
committer android-build-merger <android-build-merger@google.com> 1572475121 -0700

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

Change-Id: Ie08db102b621963854063f4168d26f6268db8ca9