tree 0c4757c0f91d5e6e76f64df753a3c7dab92641db
parent 4a86e1d12b5d87b0ca4d8b93475ff4b1f429d461
parent 73dafcf5bf8d20acd61104d3e13f9e261ec2c660
author Xin Li <delphij@google.com> 1572461445 -0700
committer Xin Li <delphij@google.com> 1572461445 -0700

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

Bug: 142003500
Change-Id: I5c96959d36d65e536da3a29073b861aa5a98ca6c