Bug 1086644 - Changing performance tests back to use legacy screen unlocking
Merge pull request #25378 from eliperelman/bug-1086644-v2.0

Bug 1086644 - Changing performance tests back to use legacy screen unlocking