Merge "Integrate Emergency functions in Telephony"
am: 7160f54c69

Change-Id: I5a8c158bcc21b247caf33948d7f4cb84d73b599e