SystemUI: Status bar UI cleanup for MSIM and roaming

Change-Id: Id0a94962ff062daeba1988ccf799ca1f8c3e2e1d

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