tree 65fbaadb40bcabb906afc27215ca2a7c74558eb3
parent bbc39cef631c17680e27833406c5cc79145f4a7e
parent 8779a59ffaa489ea8fdcaf9d33e5991588d0261a
author Xin Li <delphij@google.com> 1572461371 -0700
committer Xin Li <delphij@google.com> 1572461371 -0700

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

Bug: 142003500
Change-Id: Ic13d9562e67ac994bff3807f885657d1e2781307