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

Change-Id: If9ff9bd863b18dde6936518fd880a275ea9ca032