Merge changes from topic "ms83-module-lib" am: 4513595a54

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

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