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

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

Change-Id: I2a51baad1b5bec4cbbdbc5e93a6c773d20366cbd