Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158

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

Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b