[automerger skipped] Added support for FDN Check in am: bc22faed am:...

[automerger skipped] Added support for FDN Check in am: bc22faed am: 1370a5d9 -s ours am: 6b54828f -s ours

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

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



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