[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: c2d869b24e -s ours

am skip reason: Merged-In I6b2e963351a5c428c23986ff92a997221a95919c with SHA-1 ec14422c9b is already in history

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

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