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

Change-Id: Ia96ac82e9cbd7dbb930d02a659dfbee2fa749cd0