Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405148'] into security-aosp-tm-release.

Change-Id: I5936507b5ddfcb6a6190b295fa1ec0b8d9f0db19

Author: Android Build Coastguard Worker

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

@@ -469,7 +469,7 @@ public boolean showNextSecurityScreenOrFinish(boolean authenticated, int targetU
                 case SimPuk:
                     // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
                     SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
-                    if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
+                    if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled(
                             KeyguardUpdateMonitor.getCurrentUser())) {
                         finish = true;
                         eventSubtype = BOUNCER_DISMISS_SIM;