Merge "Support RRO for emergency number conversion map" am: 980ba91dc2 am: 255b792b65 am: 8831900674
am: a8340d5e0a

Change-Id: I57eb3c0d7967f8b8e5a0e7fb4c15509f184aadf3