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

Change-Id: Ia4390f8e2c7b9862e2da2c6d1518abab297c2dff