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

[automerger skipped] Fix sorting issue during emergency call attempt. am: 4f642851 am: c0714230 am: 3bf96151 am: 5fe063d7 -s ours am: b46c115e -s ours

am skip reason: Merged-In I3529e4f86ba5690a8c2e72d6103a84c00bf3f358 with SHA-1 4f642851 is already in history

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

Change-Id: I1e032ef29eb6912d761a5cddcc1bcf74a714a62b