tree 4d7cd45b04f71591ec7b94b06e5f0a9ae5e3577c
parent af051bf4ea7feefc27df5a79ac3a6999ab77b2e4
parent 21665d7602955534628f46b8bcf7439612b851e6
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: I5d971503d4ac3f76147901c52d221b2902d2348d