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

Change-Id: I8061bea18564fadc4456464f0f61ad828c6aa6f1