tree a43e6f7d894bf7cb2d12c7002afb1d52ef13a096
parent d177461eb419f8947c8af06fecc3cbb143c1aa6a
parent 74026bc634b3b136deaf8bebcb74b1a429faf23b
author Xin Li <delphij@google.com> 1572461233 -0700
committer Xin Li <delphij@google.com> 1572461233 -0700

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

Bug: 142003500
Change-Id: I9fe6e8e7c0492115a9856ff8ca8bece802dc1c20