Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
am: fd935d3a12

Change-Id: I94cb7eb84ce34554524339bc1ba7c64cb7b2e46a