tree 603ce0520c6b4623ca0c4fa8000775ea8c3deb1a
parent 337e12fe4044cd39f202954e6dabe2f6c8529db4
parent 008d89bdaa6817c7f6c4acaa92c6cd85dfa2dacd
author Xin Li <delphij@google.com> 1572461410 -0700
committer Xin Li <delphij@google.com> 1572461410 -0700

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

Bug: 142003500
Change-Id: I1cfe37283a3bef805c3cf90e9cd563fa08cd3de4