Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa

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

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