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

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

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