[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 596fee7ca5 am: 63d55d82e7 -s ours am skip reason: subject contains skip directive Change-Id: I414c226e399c98a87c0cfcab560148b9c5db796b