tree a498fc17004b9846fa254f4682d7f07421bd6903
parent b0189f25482618adbe9886ae58c1672d3eaba8f5
parent 140b6ba4b49f3893a8064beaf7ed4fc4de8aa270
author Xin Li <delphij@google.com> 1572461369 -0700
committer Xin Li <delphij@google.com> 1572461369 -0700

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

Bug: 142003500
Change-Id: I55b5cc1612f4321c444669e52c3d6c78ec446bbb