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

Change-Id: I0fca81579070a66640d3c5e73945f5e29e061424