tree 4ba97625a85753b41d99b98071eaae1ddd5b4d69
parent 4afe9ca36ab6c28cf826667681c57e78b5fc9554
parent 59150ebbb8186d10ab64a144d0c63e5223ff5a5d
author Xin Li <delphij@google.com> 1572461368 -0700
committer Xin Li <delphij@google.com> 1572461368 -0700

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

Bug: 142003500
Change-Id: I5dfdf08e44dfbdcf3b98af277617fd443422ccc7