ANDROID: GKI: fix up merge issue in drivers/scsi/storvsc_drv.c

In commit 22cf11e1 ("FROMGIT: scsi: core: Change the return type of
.eh_timed_out()") from upstream, the function signature changed which
conflicted with other changes in LTS releases, where the merge ended up
being incorrect.

Fix this up by resolving the issue by hand.

Fixes: 22cf11e1 ("FROMGIT: scsi: core: Change the return type of .eh_timed_out()")
Change-Id: I8256ae9d6d308f6674e1bc6e5e2a29a03f8b6f3b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>