[automerger skipped] Merge "Integrate the active emergency session listener in TelephonyRegistry" am: 4a54c2fa2b am: 64418f4c31 am: 32dfda5c4a
am: 4016d704e4 -s ours
am skip reason: change_id I5eaada6a671606642a849f0ff6fe964332d80d5f with SHA1 134334bb6e is in history

Change-Id: I5a20e6477f270e53caa0e8215bc290917df79c54