Settings: lock screen grammar fix

Change-Id: Ic6bd08ea80e6cd8970c5cb5e36e715811953d12d
(cherry picked from commit 0173f1a05480da1c0fca90bbfe0b24ddda23236f)
Revert "Settings: lock screen grammar fix"

This reverts commit 8783981290f968bc945189185aff35044ddcc66b.
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I802dafae6710486fb10852b9d5ccad1fa84d2dd4
(cherry picked from commit 596e3db674683024152620208db6860ddd28f3ac)
Merge "MSIM: Ui fixes, replace Subscriptions with real operator names" into cm-11.0
(cherry picked from commit 4480549f2a09be858f1de4b353c87076e4a4bebe)