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

am skip reason: Merged-In I249a1ba5bb1544c61af914c50d60172a0fffb416 with SHA-1 52206d283c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/27555134

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