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

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

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