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

Change-Id: I975fe05a7104d6fd2638483663c4e9b62dda6c83