Settings: Cleanup display settings code

Change-Id: Ib2a00bd7f7932ca6a75834e3cd5b4953d5b050de

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java