[automerger skipped] Merge "Use slot ID directly for phone account sort order" am: 36d4a81832 am: be4c44ddcc am: a2fc3e6520 am: 6dd9a25d8b -s ours

am skip reason: Change-Id I59d836e3fe0c756f258c3b7cbe308ce9ec9a0bd9 with SHA-1 c0c555d397 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1469991

Change-Id: I56bc033bc16276cb6382978bd606a2746a8cf23a