tree bd54c8420d669e3693d4b7cf54f5d757392b71cb
parent 1aa5eda5aadb1f3627b90170c27882e7ce249643
parent 0ce9fd68ebfe30bd1ca3ae4db7af1fd4f4517416
author Xin Li <delphij@google.com> 1572469325 -0700
committer android-build-merger <android-build-merger@google.com> 1572469325 -0700

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

Change-Id: Ib251f6329f588851d640a57fad839bf6220529c2