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

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

Change-Id: I22f911df5cb9ba95fdfe672ddd07502fa3e19f1e