gh-137191: Fix how type parameters are collected from `Protocol` and `Generic` bases with parameters#137281

sobolevn merged 3 commits intopython:mainpython/cpython:mainfrom

sobolevn:issue-137191sobolevn/cpython:issue-137191Copy head branch name to clipboard