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

Change-Id: I33a9cab89218dfbf70e3c26ad8da744b875a43b4