[automerger skipped] Merge "Support different formats of SMSC during FDN...

[automerger skipped] Merge "Support different formats of SMSC during FDN check." into main am: 5c1f43a6 am: f4164bc6 am: a971c599 am: eef7cc5f am: b0ccce44 -s ours

am skip reason: Merged-In If6d305aa40d97a1f0ba77f2d567b49a1c60607fa with SHA-1 c7c6d1ff is already in history

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



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