[automerger skipped] Merge "Merge Android 14" into main am: 5a3517e5cd -s ours am: 342fc7c708 -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: Id53cc41cc20f2b7b4d846b089d5925c329253bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>