SystemUI: Status bar UI cleanup for MSIM and roaming

Change-Id: Id0a94962ff062daeba1988ccf799ca1f8c3e2e1d
Keyguard: Change SUB label to SIM

Change-Id: I9e96b42bd072e114c453c1b031776bd66425228d
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java
	packages/SystemUIExt/res/values-land/custom_integers.xml

Change-Id: I0ea87d49e5838281f9070623741b7817b4ece6d4