Keyguard: Change SUB label to SIM

Change-Id: If3d92426e1c975870584f46d63c3ee0dfbfb3a52
SystemUI: Status bar UI cleanup for MSIM and roaming

Change-Id: Id0a94962ff062daeba1988ccf799ca1f8c3e2e1d
Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java
SystemUI: Fix network label regression

Change-Id: Idb9cd41e3e7e4951eb8c1ad5fe5321c2420f9d32