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

Change-Id: If6ff7558a0239e9f92f97eee2fe5d3faba02b1bf