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

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

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