Revert 8c450ba..354b9d3

This rolls back to commit 8c450bab26b2ec674a0b599fd227cac1818c8b2e.
Merge branch 'AOSCP-4.4.2' of https://github.com/AOSCP/platform_packages_apps_settings into AOSCP-4.4.2

Conflicts:
	AndroidManifest.xml
	res/values/aoscp_arrays.xml
	res/values/aoscp_strings.xml
	res/xml/display_settings.xml
	res/xml/notification_light_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/applications/AppOpsDetails.java