Merge "Revert "Always disconnect agents immediately."" am: fd7fa4ede9

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

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