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

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

Change-Id: Ic5082fd7a7829fa2e70dd424980bcc132890c55c