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

Conflicts:
	core/res/res/values-af/cm_strings.xml
	core/res/res/values-ca/cm_strings.xml
	core/res/res/values-cs/cm_strings.xml
	core/res/res/values-de/cm_strings.xml
	core/res/res/values-fi/cm_strings.xml
	core/res/res/values-fr/cm_strings.xml
	core/res/res/values-hu/cm_strings.xml
	core/res/res/values-lt/cm_strings.xml
	core/res/res/values-nb/cm_strings.xml
	core/res/res/values-nl/cm_strings.xml
	core/res/res/values-pl/cm_strings.xml
	core/res/res/values-pt-rBR/cm_strings.xml
	core/res/res/values-pt-rPT/cm_strings.xml
	core/res/res/values-ru/cm_strings.xml
	core/res/res/values-sk/cm_strings.xml
	core/res/res/values-sv/cm_strings.xml
	core/res/res/values-tr/cm_strings.xml
	core/res/res/values-zh-rCN/cm_strings.xml
	core/res/res/values-zh-rTW/cm_strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SystemUI/res/values-af/cm_strings.xml
	packages/SystemUI/res/values-ca/cm_strings.xml
	packages/SystemUI/res/values-cs/cm_strings.xml
	packages/SystemUI/res/values-da/cm_strings.xml
	packages/SystemUI/res/values-de/cm_strings.xml
	packages/SystemUI/res/values-hu/cm_strings.xml
	packages/SystemUI/res/values-it/cm_strings.xml
	packages/SystemUI/res/values-lt/cm_strings.xml
	packages/SystemUI/res/values-nl/cm_strings.xml
	packages/SystemUI/res/values-pl/cm_strings.xml
	packages/SystemUI/res/values-pt-rBR/cm_strings.xml
	packages/SystemUI/res/values-ru/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	services/java/com/android/server/wm/Session.java

Change-Id: I0800fdefcda33634193339d7ad095adad74c5ad7