[automerger skipped] Update RadioAccessFamily#compare in E911 am: 3d4764512e am: 42e680e02e am: 882ad2de60 am: c178043936 -s ours
am skip reason: Change-Id I11e3319e3f3351cc17f92260b4389e23bb016698 with SHA-1 3f325af9e6 is in history

Change-Id: I30bfa48191a852991eb26ab80e72feeda4dad790