testing: fix GrpcCleanupRule issue when retrying tests#8918

dapengzhang0 merged 2 commits intogrpc:mastergrpc/grpc-java:masterfrom

laurentgo:laurentgo/grpc-cleaner-rule-fixlaurentgo/grpc-java:laurentgo/grpc-cleaner-rule-fixCopy head branch name to clipboard