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

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

Change-Id: Ic0a786c24153387ee905c14d65b8c0ff088cec3a