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

Change-Id: I774d536613e5cdaab0a7f0d8a0b2a9e2fabc8c3a