tree f5d1e4306b4a9dc95ee1a3d2f16d001888fda27a
parent b80632f5173df86c5f39439224d5d20f6a59bbe5
parent 585e10f352fe726ecdc6c131dcbf0ca2c5753bfe
author Xin Li <delphij@google.com> 1572461274 -0700
committer Xin Li <delphij@google.com> 1572461274 -0700

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

Bug: 142003500
Change-Id: I5983dfd6ce00679ad9a763be2b10b48564bc58ae