Merge "Fix crash in KeyguardManager.isDeviceLocked"

        public boolean isDeviceLocked(int userId) throws RemoteException {

            userId = ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId,

                    false /* allowAll */, true /* requireFull */, "isDeviceLocked", null);

            long token = Binder.clearCallingIdentity();

            try {

                if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {

                    userId = resolveProfileParent(userId);

                }

                return isDeviceLockedInner(userId);

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

        @Override