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

Change-Id: Ic48dd840bf18c5acdc57416ea0b938b0e450c426