[automerger skipped] DO NOT MERGE Fix sorting issue during emergency call attempt. am: af569ca6b9 am: 81376616b9 am: 3557d8dae0 -s ours am: 872563caf0 -s ours am: 226f14691d -s ours am: 539dcdbd8b -s ours am: 2275cc63c7 -s ours am: bf580b22f9 -s ours am: 8d14c04904 -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: I716b87cf211db2cd238bc7c3229375e0885bf9c5