[automerger skipped] Merge "[Povider Model] Fix string in SIMs" into...

[automerger skipped] Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31 am: e1a95327 am: bb0cd8b0 -s ours

am skip reason: Merged-In I4314802840a4952acf7f090d81ca19ec28b793b2 with SHA-1 84073b98 is already in history

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

Change-Id: Icdde3a1c99a7c74774d7a6435565af6c6f4b5881