[automerger skipped] Merge "Timeout is not needed for E911 call if carrier is...

[automerger skipped] Merge "Timeout is not needed for E911 call if carrier is not in service." into 24D1-dev am: d0b67760 -s ours

am skip reason: Merged-In I32a1f73bbc56e405e11b4b9653cf37e6357b2e33 with SHA-1 2925d780 is already in history

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



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