[automerger skipped] Added support for FDN Check in am: 8c54c1dc -s ours am: a054ff8f -s ours

am skip reason: Merged-In Ifde290a188e002b5d05e210c34a50a6bf2551863 with SHA-1 bc22faed is already in history

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



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