tree 33d151b914cdb28e17e3febf0a284f22f04ed95e
parent cc13534a4ed49361edbf1ba4ded22234b111eeee
parent 3e4fd6ae9f2679471807d56e1d39e585bf2eb665
author Xin Li <delphij@google.com> 1572461409 -0700
committer Xin Li <delphij@google.com> 1572461409 -0700

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

Bug: 142003500
Change-Id: I1e3afb53db6e3bffc5eedcf763e1491ded49d475