tree 236cad670aa0ee2d57c2bf389554957d9e7e0a21
parent 92724b9d899be3bbdd7c2d2777ab979b3474899d
parent 6787a064717d659c43e55cd3d506c615da0d469c
author Xin Li <delphij@google.com> 1572469273 -0700
committer android-build-merger <android-build-merger@google.com> 1572469273 -0700

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

Change-Id: I60b516f8f7f239e1f49f43d7cd6f386b570841c1