Merge "Don't try to migrate role when getting its holders."

        @Nullable

        private ArraySet<String> getRoleHoldersInternal(@NonNull String roleName,

                @UserIdInt int userId) {

            migrateRoleIfNecessary(roleName, userId);

            RoleUserState userState = getOrCreateUserState(userId);

            return userState.getRoleHolders(roleName);

        }