tree 307a65cf7c32a5a05635dc81ba92638ef69919cf
parent 04d027c2c6a074b901f2a92bd16215887acd15db
parent b739714720f089530b1d5ce681bf0365699c95ad
author Xin Li <delphij@google.com> 1572461285 -0700
committer Xin Li <delphij@google.com> 1572461285 -0700

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

Bug: 142003500
Change-Id: If55f30139069e2b2555928cebc7c300ae1640f8e