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

Change-Id: I3470893798d226a128aa5c0d6d6cb366ce5e9c83