tree f09233dd2dabee59c9c40d580bda1cbe183621cf
parent fb72d9d16252ed63d9e1aa3465101ff19ac440a3
parent 0f11d42de356c8f4e8963052f8a6c6f9f29a96a5
author Xin Li <delphij@google.com> 1572461364 -0700
committer Xin Li <delphij@google.com> 1572461364 -0700

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

Bug: 142003500
Change-Id: Ic8505c810f7711f882c7b4bc21632f391508a9ba