Merge "Integrate the active emergency session listener in TelephonyRegistry" am: 4a54c2fa2b
am: 64418f4c31

Change-Id: Ideeb0afb508068fbe6feebbd472e94a24d94192f