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

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Change-Id: I3d62f0f9e6fd30998b10c7e00973785555080e1a
Merge remote-tracking branch 'cm/cm-11.0' into nigolbutss

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
	services/java/com/android/server/power/ElectronBeam.java

Change-Id: I697791780bc050ab56633ddbbc8203afc9191072