[automerger skipped] Ensure wifi reconnects before waiting for metered am: bb323e0926 -s ours am: 6637aead5f -s ours

am skip reason: Merged-In Iafe9837b97e4d654bb0f3962d48a94c1f31bbebc with SHA-1 c6be26e0ef is already in history

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

Change-Id: Ib49a1121875c842376d350f7f18562904e5ddf71