tree a1b813eb45f6a936c16267b86fee7c2c594d487a
parent b50d3b546a6d2c50f6b803a0ba2541d264519a86
parent 27390712a24bb67bc2005816b42bd438128f82d2
author Xin Li <delphij@google.com> 1572461260 -0700
committer Xin Li <delphij@google.com> 1572461260 -0700

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

Bug: 142003500
Change-Id: I2ec8f55d70b7a3d57e9575262b72f1149d60551c