Merge "Support RRO for emergency number conversion map"