Trump Vows to Discuss Jimmy Lai During China Trip