[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d1 am: 5c213960 -s ours

am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a is in history

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

Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf