[automerger skipped] Fix sorting issue during emergency call attempt. am: 084e020f9b -s ours am: 30d74a2144 -s ours am: 4d08d78a67 -s ours am: 1166bbfb25 -s ours am: 4e5a488f66 -s ours am: 69c1f9dd3f -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: I95cd928a18e9034023c9460e85e383fe67ad699a