Fixes #22533: angular typescript generation import statements from same file or package being overwitten by one another

Fixes #22533: angular typescript generation import statements from same file or package being overwitten by one another #16442