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

Change-Id: I990aea74c8e6817af8149e3ab54a7f8db2966845