[automerger skipped] Merge changes from topic "ms83-module-lib" am: 4513595a54 am: 13b1d94286 am: 2a244d1f81 -s ours

am skip reason: Merged-In Ia7fdf8d31a96a26b0bf1682f462292b051560477 with SHA-1 6801690383 is already in history

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

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