[automerger skipped] Revert "Always disconnect agents immediately." am: b018cb45db -s ours

am skip reason: Merged-In I6e0b5b614d9e88267db77cb807ae4bf09f88c0f6 with SHA-1 3160bc0825 is already in history

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

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