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

Change-Id: Iddce12818d71328304c7048bcb52fac91c91a4cb