tree 60eb05f2e88de4fce5c0d1574244d042b1357998
parent b0e34460285c158ad972d7aa3ce34b7bb14c19ec
parent 6a1367ef9e9105986be6dae9953990ce2f288114
author Xin Li <delphij@google.com> 1572461331 -0700
committer Xin Li <delphij@google.com> 1572461331 -0700

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

Bug: 142003500
Change-Id: I2708a14e53513cbfb09c9272ccb478634bdad2ab