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

Change-Id: I9b03c45060b5e7b436b21b5a9dbb911629973e72