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

Change-Id: I9013a3355c739e5bef7ad7bca8e2ce5396582497