tree d9b5d450a0c207f74eb6df73bef3fb118e0ffe3d
parent f5131a04a6ece2785785fc092e9fdedfcf7da61d
parent b0b4b75dec208f073be63542996e3b4af2d9f756
author Xin Li <delphij@google.com> 1572461339 -0700
committer Xin Li <delphij@google.com> 1572461339 -0700

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

Bug: 142003500
Change-Id: I09d6d10764cdb9df6f4ff1d4cb98c71a1efade49