Fix builds for 1.16 backport of drain_ongoing_call_timeout=None

Fix builds for 1.16 backport of drain_ongoing_call_timeout=None #268