Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values/arrays.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: I19de3b44e4e5c0aae63f813dd14004f54ac72bd0