Merge "Fix SIM name in Network Details to show the selected SIM." am:...

Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983 am: 4967e754 am: f6e91b15 am: 4cfe8b60

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



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