[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: 539dcdbd -s ours am: 2275cc63 -s ours am: bf580b22 -s ours am: 8d14c049 -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: I10e443f9530f18da5729b23bf6bb107c28bde4fb