[automerger skipped] Update RadioAccessFamily#compare in E911 am: 3d4764512e am: 517a268f8c -s ours am: c5e8cb6a65 -s ours
am skip reason: Change-Id I11e3319e3f3351cc17f92260b4389e23bb016698 with SHA-1 3d4764512e is in history

Change-Id: I9c3d33cf83b87e9654bade21ab28ef09c613e46c