Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	core/res/res/values-fr/cm_strings.xml
	core/res/res/values-ja/cm_plurals.xml
	core/res/res/values-ku/strings.xml
	core/res/res/values-lt/cm_strings.xml
	packages/Keyguard/res/values-az/cm_strings.xml
	packages/Keyguard/res/values-fr/cm_strings.xml
	packages/Keyguard/res/values-lt/cm_strings.xml
	packages/Keyguard/res/values-nl/cm_strings.xml

Change-Id: I4e2572eec2974fb21e99b1f18e114bc8779d33e9