Merge "Clean up the LinkProperties when stop monitoring sockets" am: 46eb5f4b5e am: d904e141f5

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

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