Merge "Add extra data when making call through emergency dialer" am: a48194ff60 am: 5f07528ca1
am: 3aeb0b5c9f

Change-Id: Ia6371c9aaed8109dc2689885d6fee0857e14fd9e