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: I69a215230b340d4bcad8fcc80500164f2cab359d