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

Change-Id: I6a233f2c28b1488801f1389dd90db4f3996acf09