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

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

Change-Id: I69e089c239402121b0677d0abfbc0fd77534cec4