tree bb50b2476df0d3f3cf36c9cbdd2b1983d793f4d9
parent 73d326679b666259085c57092b07b96bab1a21cb
parent 9116956505e39e92f60c2937069f74bae2213157
author Xin Li <delphij@google.com> 1572461310 -0700
committer Xin Li <delphij@google.com> 1572461310 -0700

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

Bug: 142003500
Change-Id: Id3b8e4ebddef4e389f2210ec26a63483d7b172bf