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

Change-Id: Ic3ddc7317f92b3d61b841aaa476e2bd734044796