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
Return: Smart Pulldown [2/2]

Adds the ability to directly open the QS panel when there are
no notifications present in the notification panel.
This commit combines the enhancement by HardCorePawn for detectin
notification types for the same.

Credits: kufikugel, HardCorePawn

Change-Id: I0a6526f8367bdf86a5216c5be0f140c80b1386d9
[2/2] Settings: Network traffic indicator

Base: https://gerrit.omnirom.org/#/c/4956/

Change-Id: Iaf0ec39fb33dbde205829e74606af34950de7049
Settings: Day and week on data usage cycle (2/2)

Adds the ability to set day and week on when the data usage
graph resets, instead of just month.

Change-Id: I5974e1b7143d09ffd6fcd6db113c3f7511346bfa
Revert "embed SuperSU into settings"

This reverts commit fa12f72b33dfbbfac9dcba67c341eeb5f729d29c.

Conflicts:

	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
Add SuperSU to Settings and may hide SuperUser or vice versa

If SuperSU is installed, show an entry in Settings below
"Developer options", which launches SuperSU when tapped.
At boot time SuperSU will detect if com.android.settings
contains the resources from this patch, and if so it
will hide itself from the launcher. This was implemented
in v1.85, so we only show the entry if the installed
SuperSU version is at least that.

Change-Id: I1796d92458587b9e961d5d8e6d58099e8367834d

Conflicts:

	res/values/strings.xml
	res/xml/settings_headers.xml
Settings: Add option to enable activity indicators on status bar (2/2)
[2/2] Settings: Emulate KEYCODE_MENU from navbar

This allows the overflow menu to be put at the bottom of the screen like on a
device which does not have a navbar
fix a derp with recent SuperSU commit
fix a derp with navring recent-app/kill-app
Customization Settings: reshuffle

Move Buttons settings to the top, move Themes and Halo to the bottom.
Switch to new Superuser