[automerger skipped] Merge "Keep old country ISO for country-related emergency...
[automerger skipped] Merge "Keep old country ISO for country-related emergency number if signal is lost" am: 807071fe
am: 69c184ff -s ours
am skip reason: change_id I08f93a5bf20d81d0cf98b87b352b84bb1425ef2b with SHA1 e452a0e7 is in history
Change-Id: I99ebf43b6e036e92a6a87146d737a61b40372a35