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

Change-Id: I173b8093f739a7d17dfe48477e1307a87f22d6b6