Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2

Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650