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

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