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

Change-Id: Ia7ff9f94fcbca381930a3a5c01bd8b0dd44f4925