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

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82