Merge "Add extra data when making call through emergency dialer"
am: a48194ff60

Change-Id: Ifa69b4c98050d39d01a22da273b5cfc9ec87333f