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

Change-Id: I1566d4e88228a1760960ac919df6456897afeefa