Merge "Use the network stack shims in services connectivity" am: 6c24db946d

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

Change-Id: Ie1afdd8c586a1060db72447db7de8b264d73a621