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

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

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