Merge "Use stable shims in service-connectivity" am: 853d3f2ce9

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

Change-Id: I343d4d056d999f3d01f5c6b55c09ad5dc706eb28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>