Revert "Fix problem where PhoneWindowManager waits for keyguard to draw"

This reverts commit 38ba23fec9906a56ddc753a27686c164120b6b4c.
Merge "Revert "Fix problem where PhoneWindowManager waits for keyguard to draw"" into kitkat