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

Change-Id: I85e549568fd7e6cd2397d2162e53308b89f7c1b0