Merge "Update RadioAccessFamily#compare in E911"