Update to lollipop 5.1.1 (Sony Z3v) threat of factory reset when wrong pattern- Can it be disabled?

[AC Question]

Ever since I installed the update to lollipop 5.1.1 (Sony Z3v), whenever I draw my Pattern incorrectly, I get this message: You have incorrectly attempted to unlock the phone 1 time. After 9 more unsuccessful attempts the phone will be reset to factory default and all user data will be lost. Is there any way to disable this setting?I don't want my phone to be accidentally or on purpose by a "friend" reset causing me to lose everything on it. Just locked is fine with me.