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

Change-Id: I8d627f0acb967563187b8f7e34c4d3dcedeffa81