tree 8df00446c980799ef3af0050d3c1c4cc5a1c88d3
parent afaa7f8be8d9b55813a5744fc7ef71958daea690
parent 343d0fc340c9b5d3afcd93435f74281fb35d4d86
author Xin Li <delphij@google.com> 1572461295 -0700
committer Xin Li <delphij@google.com> 1572461295 -0700

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

Bug: 142003500
Change-Id: I0c5eaff91ca6f75c970aa5d3ec71dce659b12b6a