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

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

Change-Id: I665df35f7a8d27efef03aa7c16be4c52306e6a29