tree 499e089d193efa50f8b4c11d7cdd723c26c680a8
parent ae8562a657e1af681b57a90cba453bc4d17fbc39
parent 77630033a1af61aeb55fbd7b29ca5f78805068e4
author Xin Li <delphij@google.com> 1572461377 -0700
committer Xin Li <delphij@google.com> 1572461377 -0700

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

Bug: 142003500
Change-Id: Iad1be53b426421d1204f1b5a4d6b85f898f1f5d0