tree 514db86712eb6427c1a94cf09517a03e6acd1336
parent bb660489b2ba8a79df7ed8e7ac857a45a935f36a
parent a4f18c83c709de919ad78c40c76ff013c0055d52
author Xin Li <delphij@google.com> 1572461287 -0700
committer Xin Li <delphij@google.com> 1572461287 -0700

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

Bug: 142003500
Change-Id: I2f989009a25486a226f783d9da823d267ab45a5c