[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev am: 8fb57ca86c -s ours
am: 03b6250d66 -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1 3b35404279 is in history

Change-Id: I5ae36080b61e1a9387b65f1ae36d88dc2b994180