Merge "Support RRO for emergency number conversion map" am: 671680e504
am: 8498a6cffd

Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97