[automerger skipped] Bring back "Added support for FDN Check." am: ebef4a22...

[automerger skipped] Bring back "Added support for FDN Check." am: ebef4a22 am: 392406b3 -s ours am: ee057a0b -s ours

am skip reason: Merged-In I8165d5e6785ba42622ee9ca7ad8c1a138bbc4dfb with SHA-1 927d040a is already in history

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



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