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

Change-Id: Ie7169cf910f576261ac569a1ae7b942d67ee83ff