Fix make_simplified_union interaction with Any#2197

ddfisher wants to merge 2 commits intomasterpython/mypy:masterfrom

fix-simplified-unionpython/mypy:fix-simplified-unionCopy head branch name to clipboard