Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6

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

Change-Id: I623ce33c3a8b526dfb160014975fbabcdfacf792