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

Change-Id: I43c8c10dc0908b92cbab6cbe346eed5185ca7173