Fix Mms preferences merge derps

merege went fine only preferences were partly messed up

Change-Id: Id385b898f4b8cae11b16bb7debf38063b600a7d3
Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Mms into kitkat

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/xml/preferences.xml