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

Change-Id: I39b05803c464a4146b5cd5caba78bad349bd09d1