[automerger skipped] Merge "Return different disconnect reason and error strings for oem and carrier satellite" into 24D1-dev am: 5c985784a0 -s ours

am skip reason: Merged-In Iac091a2e152f0128b1d8e6a97baf9b61053ba572 with SHA-1 e3e320fe87 is already in history

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

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