Napa County officials narrowly approved a key step that could allow American Canyon to expand onto disputed farmland, reviving a long-contested plan previously rejected by voters and regulators.