That's really interesting information, thanks for sharing it.
And yes, the Hubble official history makes it clear that NASA intentionally sought to reuse industrial capacity and tooling developed for the NRO's surveillance satellite programme.
My point was only that the Hubble was not a donated KH-11, not that it didn't share the same industrial base as the NRO's satellites.