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

Change-Id: Ida3a5e079eb63d6f42615a929dfa71e5bb7387da