Updating test timeouts to remove deprecated timeout option.

Previously these tests used the timeout value, which since deprecation
has now started using this value as the shell-timeout. Updating the
config to properly set the shell-timeout, and to set the test timeout
to an appropriate value consistent with what will be used in GTS.

Change-Id: Id0f0734fad43e0525690fe756399f146f98e7c62
1 file changed
tree: 7e70144c470720516e129b06f8c38930637294ba
  1. res/