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

Change-Id: Ic8909042252690f62da3ad547670dfc4a14e7e4e