Merge "Add new config for number of physical SIM slots on the device." am: 61fa313810 am: 6d9869afad
am: fbee406cac  -s ours

Change-Id: I024679d585b88cb121141ad5caf62d97efb0eb58