[automerger skipped] Fix sorting issue during emergency call attempt. am:...

[automerger skipped] Fix sorting issue during emergency call attempt. am: 084e020f -s ours am: 30d74a21 -s ours am: 4d08d78a -s ours am: 1166bbfb -s ours am: 4ccbd3de -s ours am: 3cbb08c3 -s ours am: 1421d79d -s ours am: b8c434da -s ours am: 43e593d8 -s ours

am skip reason: skipped by user tgunn

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16458618

Change-Id: Icf37b12b63c68408b12f6fad520c451065fed27b