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

Change-Id: I3a78276b761340dc263da8cc6929f33888938fb4