SQUASHED AppOps for Slim

Conflicts:
	AndroidManifest.xml
	res/xml/security_settings_app_slim.xml
	src/com/android/settings/applications/AppOpsDetails.java