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

Change-Id: Icb99ac368fddaddf753dd9d473a9372fdef8ae2f