Merge pull request #16276 from srini100/v1.14.x

Revert #15983 - gRPC channels blocking indefinitely and not respecting deadlines on network disconnect