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

[automerger skipped] Merge "Remove prefix for emergency number address while dialing per carrier requirement" am: c6455f9d am: b19193da am: bc39f3a0 -s ours

am skip reason: skip tag Change-Id Ib9c72e94685e56940b0f4c06d05696b353ed7c48 with SHA-1 061d5b38 is already in history

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

Change-Id: I5f3c53f2d4cf7ccf6dcd358c92a2777aa376fd91