am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev

* commit 'dfb8cca04dd64dcdf1df4550f7e808360de0517d':
  Don't check the keyguard PIN a second time