tree 467228b1d2441ea08d6494cfd664672865d4cf4e
parent ddd3593f40915f2a8d0af9e84d4684d2c211dc7e
parent cae3e678fa29af1008ba3560e08c9e36f8830275
author Xin Li <delphij@google.com> 1572475089 -0700
committer android-build-merger <android-build-merger@google.com> 1572475089 -0700

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

Change-Id: Ibededdd5b3b1a7aff3f1d6292e13dfa61f90024e