Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26
am: 907585c004

Change-Id: I05a4da02d0253eec03174277be22fc2daabad774