Revert "settings: add and pimp several help/reset dialogs"

This reverts commit 16695a4776cc96752fa1234fcd48c498c978c750.

Conflicts:

	res/values/slim_strings.xml
Revert "Put fragment in specific activity's whitelist"

This reverts commit 37f06a4c87e5b0dbfda75ea76716aafadef66d32.
Revert "privacy guard manager: fix intent call on fragment"

This reverts commit 73d71e1f45417ccfdd4f0de5b71b58be8de790cc.
Revert "Improve apps ops detail screen"

This reverts commit 3b4adee76a20a70ab3ea02982f4cb2a61b446b48.
Revert "Privacy Guard Slim version (2/2)"

This reverts commit 20ba27afd7f42b7596ed05ea9dd27c5a2bcc80a3.

Conflicts:

	res/values/slim_strings.xml
	res/xml/security_settings_app_slim.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	res/xml/security_settings_app_slim.xml
CM privacy guard manager [1/2]

[1/2] Settings AppOps: Forward port wifi/bluetooth/mobile/wakeup ops
[1/2] Settings AppOps: show/hide app type and allow/deny counters
[1/2] Settings: AppOps: Add bootup template
Add support for MODE_ASK mode and enable App Ops under security settings.
AppOps: Add advanced menu link from privacyguard
Allow disabling the privacy guard notifcation
PrivacyGuard: confirm permissions reset

Conflicts:

	AndroidManifest.xml
	res/layout/installed_app_details.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	res/xml/lockscreen_settings.xml
Force Expanded Notifications (2/2)
This will force expanded notifications for all apps that support
expanded notifications

Conflicts:

	res/values/jisoo_strings.xml
fix derp in heads up and CM privacy guard merge
Disable Immersive Messages [1/2]

Change-Id: I63ca47f9eecf8e3dcfc0b5b0c6cdb70b7c1a0d6c

Conflicts:

	res/values/jisoo_strings.xml
	src/com/android/settings/DisplaySettings.java