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

Change-Id: Ia9cc33c2d7affffef667b3f0f059ad35003333fc