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

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

Change-Id: I72ed1a0868a45a57cae8b5a77991c1481538bf93