Merge remote-tracking branch 'cm/cm-11.0' into kk4.4

Conflicts:
	res/values/gummy_strings.xml
	src/com/android/phone/MSimActivityDisabler.java

Change-Id: I9e4a10b4b1ee6ea1f6f9343ca46fef2540a40ee2
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4