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

Change-Id: Iebc95b53fcd642ab8a5764e7ab58a7d2ba46b172