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

Change-Id: Ia9d36994b2b1b6ec66154ede80cd0a6bd7b8c9f1