Merge "Support RRO for emergency number conversion map"
am: 980ba91dc2

Change-Id: I3c9a6be8b7c9de8df744e52ac37b97c6a4299dfa