Merge "Let the connectivity module see the shims" am: a8f97bdd8a am: 647350fac8

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

Change-Id: I3fcad051aa6a54e80ca24d600f11ca186979b4bd