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

Change-Id: I2a85fd11ccab732858bae5e793e21f64ada26260