Add back blacklist settings.

Change-Id: Iae35717acfa9af4da75c07d24352acf981d19fc7

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	src/com/android/settings/SecuritySettings.java
Add back increasing ring settings.

hange-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Change-Id: Icd203ac99a844b7c0e2002255443fc05045e10b3
Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml