Merge "Update RadioAccessFamily#compare in E911" am: 48d6d3d876

Change-Id: I162a0e4dd6a49d1ce7c38118a859d0fbbf4a08b9