tree 3fa6b4d9b35e148a0a8cf0ea7e1723dc6e1acef5
parent b8f9df4253cfa0037097602f1bc762475b0edeb1
parent bb88fc9a210be893ec6927c1e205c8b98a59bd4a
author Xin Li <delphij@google.com> 1572461248 -0700
committer Xin Li <delphij@google.com> 1572461248 -0700

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

Bug: 142003500
Change-Id: I8c357166cd80303ef5817cfb297b96bf5baaf565