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

Change-Id: I22f141892f47952231b2052b5921f59c41f2ea18