am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev

* commit '09abd164e722dfc03dad48106a557217563d3b21':
  Fix problem where PhoneWindowManager waits for keyguard to draw