BEIJING - China is expected to focus on a rematch of a tariff war with the United States in 2025 after President-elect Donald Trump returns to the White House in January, while seeking to improve ties with Japan, which could also face higher import duties.