Merge "Frame EmergencyNumber notifier in TelephonyRegistry" am: 6987e27aa6
am: 90c8797659

Change-Id: Ic19775fbd3e9c3aa5bdd8f2c24a2f8899695a46e