Updates from CyanogenMod branch cm12 into lp5.0

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_settings_privacy.png
	res/drawable-mdpi/ic_settings_privacy.png
	res/drawable-xhdpi/ic_settings_privacy.png
	res/drawable-xxhdpi/ic_settings_privacy.png
	res/values/cm_strings.xml
Merge branch 'lp5.0' of https://github.com/TeamBliss-LP/android_packages_apps_Settings into lp5.0