Merge pull request #15648 from etiennesegonzac/bug-907112-lockscreen-too-easy-unlock

Bug 907112 - Prevent the phone from unlocking in my pants r=alive
(cherry picked from commit 2946ccc07ec28cea44994d98598b85db301edd12)

a=fabrice