QS: Make it possible to show smaller tiles (2/2)

Change-Id: I19e7f3fb4c1b0e2bcae14942eb98e039cec46d67
Fix MSIM Network Settings (1/2)

Add needed extras to launch subscription selection.

Change-Id: I568666477fe9a5cf566fd94475f8d2a5ebf768e1
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
Revert "QS: Make it possible to show smaller tiles (2/2)"

This reverts commit de3d953f07fb3e7a86582e01d0e67dfe1e5b15bb.
Merge commit '116239b' into HEAD
QS: smaller tiles: Fix typo

Change-Id: I163be04778d908733b3ad2013c70e6c4bb6185a4
Settings: lock screen grammar fix

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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I802dafae6710486fb10852b9d5ccad1fa84d2dd4
Merge pull request #9 from VanirAOSP/kk44

merge vanir upstream changes