tree ce00321db4910c9745cdd4d6b0302fad61396bbc
parent 1901c5861afc5bca24af1cf466c30bde751c5276
parent a8386168233da89a9270aa9c87b38fcd70545041
author Xin Li <delphij@google.com> 1572461443 -0700
committer Xin Li <delphij@google.com> 1572461443 -0700

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

Bug: 142003500
Change-Id: I3303fa469f5d8e834df6f3e58a842b3e4dbea745