Bug 1036805 - [Settings] Too many time options for passcode lock require activate time
Merge pull request #21582 from mancas/bug1036805

Bug 1036805 - [Settings] Too many time options for passcode lock require activate time, r=arthurcc