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