Merge "Add EmergencyInfo to devices with telephony"