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

Change-Id: If58ad8d06ece8926e5dd839d704719203cd28b93