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

Change-Id: Iad879a964e5705cfe670a6567184b91d5e9d07c7