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

Change-Id: Ia3a9db64922ec0a4e01ce00130f44242cdfc6e4f