Treat typing.Dict[str, X] return annotations like dict[str, X]

Treat typing.Dict[str, X] return annotations like dict[str, X] #2369