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

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

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