Specify a timeout for the connection handshake

Email hadn't been setting a timeout on the connection handshake, so
this could have stalled the thread indefinitely.  We should use the same
timeout that we use for the connection itself.

Bug: 7583420
Change-Id: If8740b7f6c1d5fc18f40f0bb1ec7ed88d7b98af5
3 files changed