tree 51312d1ff3f502ade3bd7c049e4329cc3ad54654
parent 8e2e5a774f6a709c395e9ce08da2ad2d36f1fcc9
parent ac5a6d84912d036f93de47926987a342d76c287d
author Xin Li <delphij@google.com> 1572461339 -0700
committer Xin Li <delphij@google.com> 1572461339 -0700

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

Bug: 142003500
Change-Id: I8936c6670a729d073214e197d68719fe0fc4ce78