tree 599fefe8c0629ad115485c767cb37079b1a5e379
parent 20cfbf29e1bdc8dbadba4066cf94cbf2667780af
parent 07365c7f9a0bda52864a57ada0f8dc00daf073a6
author Xin Li <delphij@google.com> 1572470490 -0700
committer android-build-merger <android-build-merger@google.com> 1572470490 -0700

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

Change-Id: Ia67c3df04115fb4fd82a807e01e79ea9cde882c2