[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L94400030000731002:N23400030012047507" into main am: d7a9a654 -s ours

am skip reason: Merged-In Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7 with SHA-1 7b40aa36 is already in history

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



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