[automerger skipped] Added support for FDN Check in SMS. am: 4548a35c am: b1a615f4 -s ours

am skip reason: Merged-In I77f873fc34380f0101faf629da6d8ff0ec7a65ae with SHA-1 d0860452 is already in history

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



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