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

Change-Id: Idffb1d5eb6f38c676b48ae979c06f3b3c8e85f33