autotest: Rename network_WiFi_ResumeSuspendTimeout control files

These names conflicted with the much more frequently used SimpleConnect
control file suffixes.  While here, remove testing for WPA with CCMP and
WPA with CCMP and TKIP.  It seems unlikely behavior will be that
different, and it addeds a couple minutes to our test runs.

TEST=All 7 remaining tests pass.
BUG=None

Change-Id: I3ab88b376da8627932232549ebe335e7b2e4a13b
Reviewed-on: https://chromium-review.googlesource.com/177210
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
9 files changed