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

Change-Id: Idd82cf823d3e5848d3ad508d20f2ab98d5ad36f2