tree d7a327351d285f7e75585a51539d1965d76f25eb
parent 637c32456ed2182f314c522e6abcc3e5b4c7d646
parent 8478bd3ebf0c89e6579f5ac9392aeffcb7d04e36
author Xin Li <delphij@google.com> 1572461337 -0700
committer Xin Li <delphij@google.com> 1572461337 -0700

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

Bug: 142003500
Change-Id: Ib55018e3bb82460269ea11ff2421dfbbac8cf6a4