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

Change-Id: If9d4edb008827ba6de3b8d9aed9bb77708a338b6