tree ce202cbbfd6f17de3df40daa0951cbb6e073128a
parent 655cce9a9adfa5c7efc2016be8abca886a11b3b8
parent dd611e645e69ac3e2c327051307d6ace85a50503
author Xin Li <delphij@google.com> 1572461284 -0700
committer Xin Li <delphij@google.com> 1572461284 -0700

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

Bug: 142003500
Change-Id: I2b36d7d4cd66bdce9bbd1305f247131593efea99