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

Change-Id: I033628dae6364ee206064edc4047076bf67366c6