tree e46c0ea7a249ff779c38de1f76a498989be40885
parent c25d314f218cedcc7b9ba0fdacc3d81b1fd50aec
parent 5d734dc3e50ac0dd305d71a91411916f6f92f708
author Xin Li <delphij@google.com> 1572461387 -0700
committer Xin Li <delphij@google.com> 1572461387 -0700

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

Bug: 142003500
Change-Id: I881e2a3f4fbabb8bb5ca3959a22748508ce23f58