[automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: c657954171 -s ours

am skip reason: Merged-In Iab5f1b4f6a7c4496514cdef577b210a34420aaaa with SHA-1 b554a2dc47 is already in history

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

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