tree fd845444b59dfc72656b7781596e0b1a0662c4c7
parent e2c68225d78c5646256f6dd79ae06c9da105ba2a
parent 3bbeaa3d2614c7640bb851630c1ff5827b90a1b8
author Xin Li <delphij@google.com> 1572476156 -0700
committer android-build-merger <android-build-merger@google.com> 1572476156 -0700

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

Change-Id: Id2594c8f41a6fc0d75b290e83c6e9b23d9b4a43f