Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae

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



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