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

Change-Id: I9a23064fc02567d2da37425b42b7b05949e45249