[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: bb3d978113 -s ours

am skip reason: Merged-In Ic8c973caac761882481a6b2be319f41497012095 with SHA-1 be3fa44813 is already in history

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

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