tree f8c2c62094e102fa8e3922e1702a31fc35e0dcfb
parent 9fd111d6eb789597de4aaf480ced216e7766e01c
parent 7c37827127c045df01687c529dc86186d88b0a73
author Xin Li <delphij@google.com> 1572461449 -0700
committer Xin Li <delphij@google.com> 1572461449 -0700

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

Bug: 142003500
Change-Id: I03369ae08d7cb554adeabdb24a2f0cbd372b4961