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

Change-Id: I256adb7bf2d9c870f57ffe850ac30f9c4b16d16f