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

Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	src/java/com/android/internal/telephony/util/BlacklistUtils.java