[automerger skipped] [MS83.1] Make some APIs module-lib instead of system current am: 44e61e2140 am: b9db954617 -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/+/2046383

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