tree 7764b213b4f32e6e7df31143d2dd3414798290f5
parent 4ba1d0c4956272418dfa87a7170aeb5dfb63bc8b
parent e027b2ceb01acc71072baf7b8c24b0a8cb59eabe
author Xin Li <delphij@google.com> 1572470572 -0700
committer android-build-merger <android-build-merger@google.com> 1572470572 -0700

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

Change-Id: If541c9e59ed39b97526bf653b7e13a979ed1d49e