Merge "Continue to remove users when destroyUserKey fails." into nyc-dev

    }

    private void removeUserState(final int userHandle) {

        try {

            mContext.getSystemService(StorageManager.class).destroyUserKey(userHandle);

        } catch (IllegalStateException e) {

            // This may be simply because the user was partially created.

            Slog.i(LOG_TAG,

                "Destroying key for user " + userHandle + " failed, continuing anyway", e);

        }

        // Cleanup package manager settings

        mPm.cleanUpUser(this, userHandle);