Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev

            // ActivityManagerService) will not reconstruct the keyguard if it is already showing.

            synchronized (KeyguardViewMediator.this) {

                resetKeyguardDonePendingLocked();

                if (mLockPatternUtils.isLockScreenDisabled(userId)) {

                    // If we switching to a user that has keyguard disabled, dismiss keyguard.

                    dismiss(null /* callback */, null /* message */);

                } else {

                    resetStateLocked();

                }

                adjustStatusBarLocked();

            }

        }