[automerger skipped] DO NOT MERGE Fix sorting issue during emergency call...

[automerger skipped] DO NOT MERGE Fix sorting issue during emergency call attempt. am: af569ca6 am: 81376616 am: 3557d8da -s ours am: 872563ca -s ours am: 226f1469 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I808476b377d64b3262028ae7ac14a484a70b39be