Fix test expectations which appear to fail with differences in generated proto classes#36680

shunping merged 2 commits intoapache:masterapache/beam:masterfrom

scwhittle:fix_testscwhittle/beam:fix_testCopy head branch name to clipboard