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

Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b