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

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

Change-Id: Ib0cb160c285495e0c8f4ad85fca2d29785d0cc02