Merge "Frame EmergencyNumber functions in PhoneInterfaceManager" am: e2797a7322
am: 874af30ae2

Change-Id: Id7f84d6c2dd273cd6c74a1e6616e8b7b63f2d42a