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

Change-Id: I724af864abe17f6c80a30d0ae4c60b1b44968f20