[1/2] settings: Enable quick unlock

Conflicts:
	res/values/mahdi_strings.xml
	src/com/android/settings/SecuritySettings.java
Revert "Settings: Navigation bar button color (2/2)"

This reverts commit 898ef646ffc33c6fe0e62f78a053709ec0142712.
[2/2] Settings: Network traffic indicator

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

Change-Id: Iaf0ec39fb33dbde205829e74606af34950de7049

Conflicts:
	res/values/mahdi_attrs.xml
	res/values/mahdi_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/mahdi/StatusBar.java
Network Indicator related fixes
one more fix for network indicator
one more fix (Network indicator)
Network Traffic indicator more options :)

Conflicts:
	res/values/ras_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java
	Thanks lichti
Settings:Fixes for network stats
Another fix (Almost there)