[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: ef242089 -s ours

am skip reason: Merged-In I9889da2e5a5d9f49db07f438dd4c122b18031865 with SHA-1 887afebb is already in history

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



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