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

Change-Id: I149fa7e974db37b641ef616a115de55dd7edace7