Merge "Use slot ID directly for phone account sort order" am: 36d4a81832

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

Change-Id: I6548c3f904e92ae436570a205bf12a82b4d2b27d