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

Change-Id: I519be9c46cf6e50cba96597345e997f167658c23