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

Change-Id: I80820a47f4ffe0a922f91a039f6b6fd9dadb3a91