[automerger skipped] [MS83.2] Make some APIs module-lib instead of system current am: dd1d02415d am: f0517b38be am: 227c24f6fb -s ours

am skip reason: Merged-In Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1 with SHA-1 b59e5427fd is already in history

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

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