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

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

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