[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: d877d0cfc7 am: 0580efe90f -s ours
am skip reason: subject contains skip directive

Change-Id: I70366ee994721b7404c7b9ac393d9558a0b4e553