Merge "Reconnect to wifi if supported" into main am: bd579b4658

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

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