[automerger skipped] Merge "Frame EmergencyNumber functions in PhoneInterfaceManager" am: e2797a7322 am: 874af30ae2
am: cf1699e1dd  -s ours

Change-Id: Id58d7d95b3d1da3cd4d88ba6105f58cdf6f55337