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

Conflicts:
	packages/Keyguard/res/values/dimens.xml

Change-Id: I6d5ad3efc40a5f3d4f4ea489f76f66421e63106f