tree 33c2e88f3ff23a1620fc15a2011c11c781fd7148
parent 6bb7a2f5a3d9daea9b10e20d1c568f49b01a2e81
parent 10ea32d47069eb026f822e30a9a23be9d0345ca1
author Xin Li <delphij@google.com> 1572476515 -0700
committer android-build-merger <android-build-merger@google.com> 1572476515 -0700

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

Change-Id: I13be2168c9a81288713e1d010d54de24d0aac3e8