Update lockscreen tests to tap, unxfail due to resolution of bug 831852

`master` -> Tested, ok to merge
`v1-train` ->  	a78bb65 commit only,
merge d69d359 when https://bugzilla.mozilla.org/show_bug.cgi?id=889466 is uplifted to v1-train.