MSIM: Expanded StatusBar: Show SIM slot number

Change-Id: I5c9ba33bfd564ba5301072ba1ef8c33640943710

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java