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

Change-Id: I093ff57761ba8e69da44e3d5699c75e150da1a0c