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

Change-Id: Iefa8d9e81b087acc374042917919731b300eed68