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

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

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