Merge "Add support for FDN contact dial" am: 56a30a6647
am: 7cbebb99da

Change-Id: Iacdc1f698bca8aaf1a60abe2e8175043e5985b9e