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

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

am skip reason: Merged-In I62ca42a254d6faa15a3adaef5ead9a1b9d17d2b1 with SHA-1 73049250 is already in history

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



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