Are there any tensions with China over DJI imports to the US? As far as I'm aware, the antagonism against DJI is entirely within the US government. Resolving it doesn't require anything from the Chinese government, does it?
I would imagine that a lot of the 'scrutiny' would be avoided if it looked as though you'd been using it along with any other camera gear you took with you for the trip... and it wasn't still in the packaging.