Replace connectToWifi with ensureWifiConnected am: 0828c6e0f2 am: 004e74dd8c am: dff1922f5d am: 4f3cac0f14

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632990

Change-Id: I6fd861157bafbec22d8b1b69b12f89f84550ebdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>