tree d97183c3280b99ee60ef74424c2dc8587620aa03
parent affffb66ec25c17986f606106460f9c44eb7d8ec
parent 24a49e2f917ba4edf76882258c75755ee4e4d72f
author Xin Li <delphij@google.com> 1572461281 -0700
committer Xin Li <delphij@google.com> 1572461281 -0700

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

Bug: 142003500
Change-Id: Ib8784c732586532890ed05a674c4986d2fe4f2dc