[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: a1c1738d -s ours

am skip reason: Merged-In Ie97ef69f6f9e7209e65c600ac78639a1c40e0fd5 with SHA-1 882243e5 is already in history

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



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