tree 1e00499c0bed9db81feab51bbd69f4652a2a82ad
parent a52840d69fa94794f482ea2b09533a0747e1e4ce
parent 9f3b48be477abd3c40dd1bde072dfe19851b6cf9
author Xin Li <delphij@google.com> 1572461266 -0700
committer Xin Li <delphij@google.com> 1572461266 -0700

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

Bug: 142003500
Change-Id: Ic7694c1ec58d3418533aefd9cd2870b57f17d8e1