Bug 968120 - Address test_lockscreen_unlock_to_emergency_call intermittent Travis/TBPL
Merge pull request #15981 from zacc/bug_968120

Bug 968120 - Address test_lockscreen_unlock_to_emergency_call intermitte...