tree 35950b15531836715da1980005502ab50e5222b8
parent 6dd56ab1bec04be72d1630b065b701d0c5d2e4b8
parent f50edf110f2a57d4f8d13fa8c2fe3f2fbd223d11
author Xin Li <delphij@google.com> 1572461261 -0700
committer Xin Li <delphij@google.com> 1572461261 -0700

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

Bug: 142003500
Change-Id: I6763cdf5f246ac09b5b5b611c426ddbf0b246859