tree d36ba7c6a583c2a0f5b2526adea25358d8dc585e
parent 00e5b03d2de4c17a65f973f0afc944d3f0c33ceb
parent 633ad2e28a4c742544a83e84306fff892cdd5436
author Xin Li <delphij@google.com> 1572461245 -0700
committer Xin Li <delphij@google.com> 1572461245 -0700

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

Bug: 142003500
Change-Id: I975cda2961842a3c476375bba7cbe6cb78bdd34b