tree 03c8c05c7b3a94cd04a62f691af3a4dc6aa59235
parent 4b6dc1b8fe513f3e737c98880067cd772167729b
parent 65c5853fe20fdbd5f0023aa252c2d616432298a0
author Xin Li <delphij@google.com> 1579132629 -0800
committer Xin Li <delphij@google.com> 1579132629 -0800

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: Ib8ac5e10adcd93c3c6b647c2e053c24be4bcffde