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

Change-Id: I30c7b334090ba784d65691261c931b663253036a