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

Change-Id: Ic75a00232ef7200a76832f406fbb63f2e117214b