tree 32004465065b431a8ed1c140d25898dee2cee756
parent d38204c9c7da5e3da4bd54641ab06aa800471799
parent ce9bc12ea70b0ee0d2861cb9309bce6ef9850095
author Xin Li <delphij@google.com> 1572470543 -0700
committer android-build-merger <android-build-merger@google.com> 1572470543 -0700

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

Change-Id: I7a7194be0056c860569e9b7b23529b7a65de4b4f