[automerger skipped] Merge "Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink" into tm-mainline-prod am: 961b0dd155 -s ours am: ec22caa7d8 -s ours

am skip reason: Merged-In Ie07603ea51dda1ffdeb15f753bda7892d9137766 with SHA-1 46ab01cce9 is already in history

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

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