[automerger skipped] Merge "Update RadioAccessFamily#compare in E911" am: 48d6d3d876 am: 5afcb19af7 -s ours

am skip reason: Change-Id I11e3319e3f3351cc17f92260b4389e23bb016698 with SHA-1 3d4764512e is in history

Change-Id: If179f4aebe94bf5a445939350d4ae67ba404ae73