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

Change-Id: Id8ccbcda7a25feb1cc86bcd4f159d1d826d6a50b