Keyguard: fix chopped keyguard on hdpi MSim devices

Both the CarrierText and MSimCarrierText were in the View, taking
additional space. Remove CarrierText from the view in case of MSim.

Change-Id: I803695044d06470ef9af59863ba92444e41488f5
Improve strings

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