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