Fixed an inconsistency when booting up with SIMPIn

The lockscreen was skipped when the security mode was
swipe, which is inconsistent with the normal bootup
behavior.

Bug: 21850021
Change-Id: I2c59b1428d489fad566097771ca449ba667f34d2

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java

@@ -329,7 +329,9 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
                 case SimPuk:
                     // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
                     SecurityMode securityMode = mSecurityModel.getSecurityMode();
-                    if (securityMode != SecurityMode.None) {
+                    if (securityMode != SecurityMode.None
+                            || !mLockPatternUtils.isLockScreenDisabled(
+                            KeyguardUpdateMonitor.getCurrentUser())) {
                         showSecurityScreen(securityMode);
                     } else {
                         finish = true;