update keyguard stuff

Change-Id: I4d3d8b286ad0c7ea8db9f68bbbbeee8dc47a4c34