Bug 832706 - Support more granular time allowances in phone lock r=kaze
(cherry picked from commit 0ccdcb957c6cbcfeea453cfab0898e9988111c62)