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

Change-Id: I68ee936500392cb7b8844dfde58987c41888b209