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

Change-Id: I377d11d6102722b32b335caf2e215f83720aa07e