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

Change-Id: I82c36afb63867fb93841c92e8e563cc499b5f782