AriesParts: strip down to display settings

To be put under "advanced" in display settings

Change-Id: I7b91cee11c5d3a2a1791f7c05b0064a23aae07f2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_device_samsung_aries-common into cm-10.2

this also reverts this upstream commit:
https://github.com/CyanogenMod/android_device_samsung_aries-common/commit/0c4459e63cfdbcf87b15bb131b269c48d6c3b3c6

Conflicts:
	AriesParts/res/values-cs/strings.xml
	AriesParts/res/values-es/strings.xml
	AriesParts/res/values-fr/strings.xml
	AriesParts/res/values-it/strings.xml
	AriesParts/res/values-iw/strings.xml
	AriesParts/res/values-nl/strings.xml
	AriesParts/res/values-pl/strings.xml
	AriesParts/res/values-ro/strings.xml
	AriesParts/res/values-ru/strings.xml
	AriesParts/res/values-zh-rCN/strings.xml
	AriesParts/res/values/strings.xml
	AriesParts/res/xml/main.xml
	AriesParts/src/com/cyanogenmod/settings/device/DisplaySettings.java

Change-Id: I8346f0e078c9a327b63002f24a082826f34292ae