fix settings
Settings: Generic Blacklist support (1 of 5)

Change-Id: I58aff50637b9bf71095ec791e16efd520e6c29a3

Conflicts:
	AndroidManifest.xml
	res/xml/security_settings_app.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
Improve translatability of summaries.
fix build#2