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

Change-Id: I50fb1eac54a16aaa04da67796addc3775574e758