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

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

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