Settings: update a few CM strings

Change-Id: I2030502c51e44076f8ac17256b1485a060598db7
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
QS: Make it possible to show smaller tiles (2/2)

Change-Id: I19e7f3fb4c1b0e2bcae14942eb98e039cec46d67
Merge "Settings: update a few CM strings" into cm-11.0
Fix MSIM Network Settings (1/2)

Add needed extras to launch subscription selection.

Change-Id: I568666477fe9a5cf566fd94475f8d2a5ebf768e1
Merge branch 'cm-11.0' into cm-11.0-sc
Settings: Only disable menu unlock options with custom keyguard

These buttons have a proper use case with the regular lock
screen, but are not applicable to our custom lockscreen.

Change-Id: Ic5af82bc1998a2960ba44d4235881d46e5081e5b
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge "QS: Make it possible to show smaller tiles (2/2)" into cm-11.0
Merge "Settings: Only disable menu unlock options with custom keyguard" into cm-11.0
QS: smaller tiles: Fix typo

Change-Id: I163be04778d908733b3ad2013c70e6c4bb6185a4
Settings: lock screen grammar fix

Change-Id: Ic6bd08ea80e6cd8970c5cb5e36e715811953d12d
Merge branch 'cm-11.0' into cm-11.0-sc

Conflicts:
	res/xml/quick_settings_panel.xml