[automerger skipped] Merge "[Satellite Transport] Honor soft disallowed...

[automerger skipped] Merge "[Satellite Transport] Honor soft disallowed reasons" into 24D1-dev am: 3988c552 -s ours

am skip reason: Merged-In Ia78f822b6b23581bc145162df3f12e9a937ac57d with SHA-1 6d98f1bd is already in history

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



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