tree f910ae75e271bc79a22d9a73b94da6bdbe01d330
parent ea3fbf9316bf277289c2c21588b900410b869164
parent 121544bcb8fe54d1824c18a09502e53f07123134
author Xin Li <delphij@google.com> 1572461266 -0700
committer Xin Li <delphij@google.com> 1572461266 -0700

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

Bug: 142003500
Change-Id: I097d907d56ff18010bef7f5a953e633b82c9cc2f