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

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

Change-Id: If4b5e3481dabc290406125041260e2336bc640a9