Merge "Wait for next network in waitForAvailable" am: e9f65535e0 am: f38d076a83

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

Change-Id: I5121e9339bc88ed45c5ec4e995b1f2583803fee2