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