[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L22800030000756195:N75200030012855151" into main am: a2b80663 am: ef5af1f0 am: 5a937d00 -s ours

am skip reason: Merged-In I5bafa8a85d4f2169fcdef73e2d9f21534553ff72 with SHA-1 fc084ea8 is already in history

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



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