tree 6068b4b9fbce32d98a52cd6ec284a418b310dc68
parent 4800c18467ce6103016a94861b51eae434873898
parent bf74ae8b9c749e81e12e9d351f4a2d157774aeb0
author Xin Li <delphij@google.com> 1572461378 -0700
committer Xin Li <delphij@google.com> 1572461378 -0700

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

Bug: 142003500
Change-Id: Ie27939e2eabc78c0c9105f7a42f49ee15cb28685