[automerger skipped] Merge Android 14 am: 1c77f09ccd -s ours am: ba69b36026 -s ours

am skip reason: Merged-In Iad740804a59599dd33add1ea85aa4771e0e4bd35 with SHA-1 aa2f4d839e is already in history

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

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