tree 26a0cc77bb00efc51979bb5303d0b906c628a2ee
parent 728d38fb7b7f7ecec5a4b46ddcf2bfcf74bb6469
parent 65e06b8d4ca4db7559ad8e137a01a515caacd6b0
author Xin Li <delphij@google.com> 1572461247 -0700
committer Xin Li <delphij@google.com> 1572461247 -0700

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

Bug: 142003500
Change-Id: Ia6359afda56ce92ceecba75b1a0e485d4256144b