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

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

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