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

Change-Id: I2ebb315b3e88751c5d038032cc31a3b32e010737