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

Change-Id: Ib93020f2e2e64207c08a604f9c70d794fee9fe1d