Merge "Do not send socket destroyed on unregistration" am: 76bd680f3d am: a2df145a3b am: cf746049e8 am: f3ad8af0f5

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

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