tree fbfba66e46e8eb41ed5f18eee646b5cd72dd4583
parent de1b4be0c4715a22837129f65cdabd6c8f5b8d7e
parent accd557c7e26fcb91a1c64cbe5f41dfe2e05e475
author Xin Li <delphij@google.com> 1572461208 -0700
committer Xin Li <delphij@google.com> 1572461208 -0700

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

Bug: 142003500
Change-Id: I9c61b926ea2132819e1f07a101e67af9d86eae5d