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

Change-Id: Ic0dfa389aa76a53f94392f1c57921d0c55356b54