Merge "Do not check active socket from other callbacks" into main am: 95d380fefd am: 7a7942befd

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

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