Merge commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e' * commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e': Fix race condition in WindowManagerService.disableKeyguard()
Merge commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e' * commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e': Fix race condition in WindowManagerService.disableKeyguard()