tree 7f39495551c65a37f40b23544dee1cbc221feebf
parent 07746edd96078e1ced26d0f43482dcb821734033
parent 6e84ee222d491625b3f57d38e16806e6b7a92b5d
author Xin Li <delphij@google.com> 1572471819 -0700
committer android-build-merger <android-build-merger@google.com> 1572471819 -0700

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

Change-Id: I17e22bcef79894f7ba827eacbddf653f2d1ae2be