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

Change-Id: I780f1d12701648ac27b5ad4280cfcd0c9bf0cf22