Merge "Remove PROPERTY_SIM_COUNT and "ro.telephony.sim.count""