tree da2cef388cab11b1e36d0d132999f49a69286e7f
parent e3e9c23a19dd363f34d428de0062f0225b8bbdbf
parent 1bd20c1d89e8db88b7e718a5e8929b6cf0489cb8
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: I53b1a32f9ad28ef83770ce7ad4ea2ed8f5e75ae5