Merge "Stop monitoring sockets until all sockets are unrequested" am: 6772a31c5a am: 573b59a022

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

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