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

Change-Id: I99d773a7297ec98e60d2de8f3ca7d1abe3ad2df1