Display settings: add touch control packages

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