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

Change-Id: I83af0c2ec6c21166ebb2af1a810bd1de5b5e97c9