[automerger skipped] Merge "Sorting and merge Emergency number better" am: 79ac5cb6
am: 3bebc118 -s ours
am skip reason: change_id I50fec4e7d004be5c9dabbda0084d3c2754f140c7 with SHA1 f66eefaf is in history
Change-Id: I2881ebe26495aa1dec6dc4cdfb5e34afc28f3911