[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: b3c8e2ef...

[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: b3c8e2ef -s ours am: 6344bd03 -s ours

am skip reason: Merged-In I552ee1778fe7b324118e61ea465a9c46f4528468 with SHA-1 80fd1d03 is already in history

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



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