[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: a980758c -s ours am: c4cc6c4b -s ours

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

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

Change-Id: Ia9fd2f306f71be3f0b99e1752d0092dcf7f7e034