Merge "Fix Keyguard PIN  error message for N < 4."