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

Change-Id: Ie82cc7eb41329821fc79ac94659ab84c3b59c3f2