tree 8080c28a06af52bf28799c3f80aa1bcfd3dba0c7
parent 8960a6f451e3599328a36e308657fda79c508139
parent ce7fcd3c39769e80d72a2b83ffca85a7722fbe53
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: Iaa101cd02cf992f48e80f6b2c8d217601eab5634