[automerger skipped] Merge "Frame EmergencyNumber notifier in TelephonyRegistry" am: 6987e27aa6 am: 90c8797659
am: fb203f236d  -s ours

Change-Id: Iee959e87a32ce98c155c53e3f6574fb27dca39d8