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

Change-Id: I3c990b40badf71b5d8337d4e8e3add2bf9c8a5ef