Merge "Fix urn compare in EmergencyNumber"
am: 1f55cbf416

Change-Id: I722e0b9093a569aa609ed9b239dc517442e74a2f