Merge "Disconnect network when captive portal returns unwanted." am: 3597deb5e1

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

Change-Id: I3baf682cedd0df03c1716938ce23fa2abc39daff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>