Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values-af/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-es-rXA/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-ku/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-zh-rCN/cm_strings.xml

Change-Id: I54a197d1439082add507050fbffcd83ef348debe