tree 28ce16b16a7e52db33e3f6e094e396893e0d2001
parent 354b83c816c0a08e321bf2241825636b958933c5
parent 255d046aeb3e631d250dfccc942432b7c9f567d1
author Xin Li <delphij@google.com> 1572471814 -0700
committer android-build-merger <android-build-merger@google.com> 1572471814 -0700

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

Change-Id: Ia65a4b2b90c428ab3ce378da36deae2ded286431