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

Change-Id: I9bca7f94409ccbbd9366f918fd2b5e8dd5e02ad9