tree 652735a615f78e8873ccb0884b2a0220aeec6636
parent 3d4c6abf828cc500a4629f14111f5454324b8b0c
parent a70efd9d9fc9866e1eef4dfc1d0a9b1a97a9c6b1
author Xin Li <delphij@google.com> 1572461312 -0700
committer Xin Li <delphij@google.com> 1572461312 -0700

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

Bug: 142003500
Change-Id: Idbcb93afedbed3d245e3432f9232be07614df5d3