tree 0ec013b648cebf24d9a5c442df5eb532799df28b
parent f9f860d88e72d5b79c82c4aa22f63f93f87a305e
parent 9dcf1b7011a031ace23054a6b76ae98c7f2808cf
author Xin Li <delphij@google.com> 1572461402 -0700
committer Xin Li <delphij@google.com> 1572461402 -0700

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

Bug: 142003500
Change-Id: I6e3ee6c45ba613fe86cfe452d9d090cbfdeba6c4