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

Change-Id: I84c6fd6c55db5f4d0b900b38f2adec755d408e84