Merge "Add new config for number of physical SIM slots on the device." am: 61fa3138 am: 6d9869af am: fbee406c -s ours Change-Id: I024679d585b88cb121141ad5caf62d97efb0eb58