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

Change-Id: I140d621dca7e49af9daf03708cab6e85b89f2ebb