[automerger skipped] Merge "Revert "Remove prefix for emergency number address...

[automerger skipped] Merge "Revert "Remove prefix for emergency number address while dialing per carrier requirement"" am: be0ca6ff am: 54571a4f am: 95e4c326 -s ours

am skip reason: skip tag Change-Id If616530c01f7c3e50734988a1dc5b9d69dd4c2c0 with SHA-1 c731520e is already in history

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

Change-Id: If7317cad5237cfcd826aa1da01dc84a4aa6f8ac5