Increase Wi-fi CTS timeout for bringup on restart

Automotive reference hardware needs a slight bump in the timeout time
after WifiManager#restartWifiSubsystem is called when testing that the
WifiManager.WifiConnectedNetworkScorer#onStart is called.

Also, separated and renamed the timeout/wait variables to more
clearly show how they are being used as well as to not increase the
overall wait time by the aforementioned bump to the timeout time.

Bug: 191790533
Test: atest CtsWifiTestCases:
android.net.wifi.cts.ConnectedNetworkScorerTest

Change-Id: I6606c2c8cdae4997b6888cd6120f366373c31cf3
1 file changed