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

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

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