Settings: Fix up top level "Privacy" section

Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/security_settings_app_cyanogenmod.xml
	res/xml/settings_headers.xml
	src/com/android/settings/SecuritySettings.java
Fix blacklist preferences fragment transition for tablets.

Change-Id: Iecde099b111ae31c8e11ce366d9d06d965029ed7
remove app security category from Security settings
[2/2] Losckscreen Notifications fixes

- Lockscreen Notifications: fix removal of pocketmode setting
from: https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ic371e2b409de9c77c7b33aa1eead14cd0a0df563
[2/2] Settings: Lockscreen notifications: Option to disable dynamic width

Change-Id: I79b76134e9ff29ea5e305129870d6c5517907203

Conflicts:

	res/values/ok_strings.xml
[2/2] Settings: Lockscreen notifications: Allow apps to be excluded from being displayed

Credits to 0xD34D / ChameleonOS for the original implementation for Active Display

Change-Id: I5153748bb7d8f6cc0a255628c4df5697d5a64939

Conflicts:

	res/values/ok_strings.xml