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

Change-Id: Ifed6cc6b982f322a479882b6465d1b473faaee65