tree 467228b1d2441ea08d6494cfd664672865d4cf4e
parent 7bb2ddae9c0157e8f5262450abde1d91ea7a04c8
parent 444a2050da82eeccc4ca70a626b59858bdf258df
author Xin Li <delphij@google.com> 1572461363 -0700
committer Xin Li <delphij@google.com> 1572461363 -0700

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

Bug: 142003500
Change-Id: Ia457d5f346b92ff2e0cf6220c7b2c28a5e2e2ea6