tree 161a121cc2729fc71e04e8f1e87e9c3b292f7bbe
parent e2610711223ad1aba7ca41d660991d20f2fa4121
parent a6e19f54b5a0e41faacfac9f79a968df21af1ed9
author Xin Li <delphij@google.com> 1572461272 -0700
committer Xin Li <delphij@google.com> 1572461272 -0700

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

Bug: 142003500
Change-Id: Ibffd6dafd874a4df76555eca1a90b9f81a470f0c