tree 3fa6b4d9b35e148a0a8cf0ea7e1723dc6e1acef5
parent bb88fc9a210be893ec6927c1e205c8b98a59bd4a
parent a744f6b78ab37d01e5116fc4a77fe05a15b43429
author Xin Li <delphij@google.com> 1572470458 -0700
committer android-build-merger <android-build-merger@google.com> 1572470458 -0700

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

Change-Id: I5b4dc5c5f6cdb6527fd17fe1aa262f7b74c380eb