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

Change-Id: I3697dfe92e9323f904fc4d990ea28f747a989e2b