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

Change-Id: I613e3cfab0ec2391100c4cc8897160ce453fb9df