[automerger skipped] Merge "Sorting and merge Emergency number better" am:...
[automerger skipped] Merge "Sorting and merge Emergency number better" am: 70ed8dba am: 22f7e515 -s ours
am: 617cd55e -s ours
am skip reason: change_id I64a43886d4000b261ea703b081e6278b0307805f with SHA1 a1f21a5c is in history
Change-Id: I687dd7cc0bc2d0b607903c5ff41cab8868c435b2