SystemUI: Status bar UI cleanup for MSIM and roaming

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

Change-Id: I9e96b42bd072e114c453c1b031776bd66425228d
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0