tree 60eb05f2e88de4fce5c0d1574244d042b1357998
parent de62fa3be9866a2ec860ac3bd911138b0735adfa
parent 0d22775e991f172e0215ec098812f9664ea99eae
author Xin Li <delphij@google.com> 1572474945 -0700
committer android-build-merger <android-build-merger@google.com> 1572474945 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 65450e5be4
am: 0d22775e99 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbf421ee8a3e07f760e3311b36b67750fff2e21b