[automerger skipped] Merge 24Q3 to AOSP main am: 253e395b -s ours am: e02c5473 -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: Id73e9a22e3aa2b1df606f37ba0b292b6696ba817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>