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

Change-Id: I8d865e77fe485b15cbf0ecc4104335f4d98dcc0d