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

Change-Id: I9ac7cb6eaf9fe564ecb4dd9ff85c0489311df253