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

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