Merge "Always disconnect agents immediately." am: d925df8aa6 am: a89d79e3c7

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

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