[automerger skipped] Merge "Integrate Emergency functions in Telephony" am: 7160f54c69 am: 1e1e8ac994
am: 0968c5ca2c  -s ours

Change-Id: Ib4ba14d7ada47afad7184bbcf1733ea433519c84