Merge "Ensure wifi reconnects before waiting for metered" am: 14f0d14c14

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

Change-Id: Icdf3557348e3a4f58c7e988057609cbbbd9e5e33