[automerger skipped] Merge "Reject e911 call when connected to oem enabled satellite." into 24D1-dev am: b6a4bf256e -s ours

am skip reason: Merged-In I681905213e61bffb4cc4c4fd2d425d56a487eac0 with SHA-1 44a1a4b91c is already in history

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

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