[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: 020ab0b885 -s ours am: b4940b4e9f -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: Ic141fbce78ca4796c3d2d64aad26a4a1b79d62ca