Fixing context timeout regression

At some point in the past, a context timeout would fail futures with a
V23 Timeout exception. However, recently it fails with a
CancellationException. This restores the previous behavior.

Change-Id: I010cbd83ceee44300c6329fec10ba238d09d05d0
4 files changed