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

Change-Id: If4fca2a8d738a6d92e16bc8579ce31cf6fd18e4e