tree 7764b213b4f32e6e7df31143d2dd3414798290f5
parent 2ed5fb7c1f975e972d92aae3f53b1c61bd500422
parent bdeff76114e0a969d9922da09e8c3b317f1bcda1
author Xin Li <delphij@google.com> 1572469146 -0700
committer android-build-merger <android-build-merger@google.com> 1572469146 -0700

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

Change-Id: Idf07e93051343f13c7e8abe59d2fc44f249b3a83