[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev
am:8fb57ca86c-s ours am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA13b35404279is in history Change-Id: Ic36dba3e62e26f0699467d1ccbfe9087c5d19c29
This commit is contained in: