tree 599fefe8c0629ad115485c767cb37079b1a5e379
parent 903e471c5567f6043d01ce5f7da6e6c1ba764f81
parent e692454f422c48b5f0d4fa991fd3e8e7f85d7373
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: Ie57b7b5851749c079dfa1a974016d6e5659a59ac