Fix builds for backport of drain_ongoing_call_timeout=None (1.17)

Fix builds for backport of drain_ongoing_call_timeout=None (1.17) #267