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

Change-Id: I19570d1a1b2dc5692b9f69e2e1c21feec1da959c