tree fd363aec6d806243669e24edb6b5c2c8e3c82903
parent 4e6ea23e23ea902ffae2b438cf7418be7da236b6
parent bb63c2d37da24da3625952de0344b5543dc4897b
author Xin Li <delphij@google.com> 1572461358 -0700
committer Xin Li <delphij@google.com> 1572461358 -0700

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

Bug: 142003500
Change-Id: If4f7908be78980bacb5774688c9ba5e5ccf35178