Ha! You’re trying to use layman’s logic, not governmental entrapment.Not an attorney and this shouldn't be taken as legal advice, but in general: If you had only the pistol upper and only the rifle lower, yes. An assembled rifle and an assembled pistol, no.
And how about all those extra uppers sitting around?