tree 8b5f7a1286ab6687622b3347da64ef6ccb398d05
parent c4b33b7a214ba25d4ca894b9d42bff6f85fe4407
parent 0020ce6af28b4f2af046cbfa9f045565a7cc6bef
author Xin Li <delphij@google.com> 1572461250 -0700
committer Xin Li <delphij@google.com> 1572461250 -0700

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

Bug: 142003500
Change-Id: Ib46dbc7e9bc041503d46e1b52fb66f6116bbabbb