Merge "Check user existence in UserManagerTest.runThenWaitForUserRemoval."

    }

    private void runThenWaitForUserRemoval(Runnable runnable, int userIdToWaitUntilDeleted) {

        if (!hasUser(userIdToWaitUntilDeleted)) {

            runnable.run();

            mUsersToRemove.remove(userIdToWaitUntilDeleted);

            return;

        }

        Function<Intent, Boolean> checker = intent -> {

            UserHandle userHandle = intent.getParcelableExtra(Intent.EXTRA_USER, UserHandle.class);

            return userHandle != null && userHandle.getIdentifier() == userIdToWaitUntilDeleted;