[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 61bf72313d
am: 28079a4c78 -s ours
am skip reason: subject contains skip directive

Change-Id: If5a5fec46d05402399811bc51c2d0f40d7cec9f6