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

Change-Id: I75583e835067a9b62e9f7137516f3bfca63b64d8