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

Change-Id: I934bbd06baa0bf094252421c6ae31dc7df1a9bc3