tree e89f35503b253ac18431615ea2d04c31c6231708
parent dbb257c2a3119760ea7047b18b8e83b196fffe3a
parent fb624c5f74fa15ee82df955dc98fa2b9d5cbb8c5
author Xin Li <delphij@google.com> 1572461441 -0700
committer Xin Li <delphij@google.com> 1572461441 -0700

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

Bug: 142003500
Change-Id: I17fe2ce9f1d6a9048e7161c325228915a330e12a