Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782



Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>