Merge "Do not report satellite network if carrier config is disabled" into 24D1-dev am: 16073aa4

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



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