tree 0e3600a80cd4c3877072c5175132c350fddd287a
parent 8dc55a3c73dc93e8903e5e5dad0f1e8124777872
parent c0378db17a7e5b85cb006074a65949f232dd8b2a
author Xin Li <delphij@google.com> 1572461370 -0700
committer Xin Li <delphij@google.com> 1572461370 -0700

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

Bug: 142003500
Change-Id: Ibc88c85edbbde9344ad5aa89714025a71a71d987