[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ead3ab68fe am: 5687a73d9c -s ours
am skip reason: subject contains skip directive

Change-Id: I00a0b32284a9f2e44f83c8974605fc5b4231611c