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

Change-Id: I648e00794e28db2b5165f009c2afcbabc253fca7