[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to...

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

am skip reason: Merged-In Ic3d490422ea7973a21a59b5363232f8b8c06f872 with SHA-1 459bd6f7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/27551929



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