Bring in some CM Author:rmcc https://github.com/CyanogenMod/android_packages_apps_Settings/commit/6ef90d3ebd47aba87ea5cadbef275fd08edd0b81

Conflicts:
	AndroidManifest.xml
	res/values/dimens.xml