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

Change-Id: I8ef5867da89e6c2a81071a8c5492a20a2e56504a