Merge "wifi(cts): Pick the last saved network for testing" am: 3191d519bc am: 5c750b1771

Original change: https://android-review.googlesource.com/c/platform/cts/+/1475376

Change-Id: Ic6fe6da08d14d18d1d1d11b4acd12c8bbf760f94