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: I9e5d4382bf3060364b73f5edb3a4f789f75913b6